Skip to content

Commit 8af0db9

Browse files
committed
style: use 2-space indentation in new test files
1 parent 8a17d85 commit 8af0db9

7 files changed

Lines changed: 59 additions & 59 deletions

tests/acceptance/bashunit_hook_source_failure_test.sh

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,54 +2,54 @@
22
set -euo pipefail
33

44
function set_up_before_script() {
5-
TEST_ENV_FILE="tests/acceptance/fixtures/.env.default"
5+
TEST_ENV_FILE="tests/acceptance/fixtures/.env.default"
66
}
77

88
function strip_ansi() {
9-
sed -E 's/\x1B\[[0-9;]*[A-Za-z]//g'
9+
sed -E 's/\x1B\[[0-9;]*[A-Za-z]//g'
1010
}
1111

1212
function test_bashunit_when_tear_down_sources_nonexistent_file() {
13-
local test_file=./tests/acceptance/fixtures/test_bashunit_when_teardown_sources_nonexistent_file.sh
13+
local test_file=./tests/acceptance/fixtures/test_bashunit_when_teardown_sources_nonexistent_file.sh
1414

15-
local actual_raw
16-
set +e
17-
actual_raw="$(./bashunit --no-parallel --detailed --env "$TEST_ENV_FILE" "$test_file")"
18-
set -e
15+
local actual_raw
16+
set +e
17+
actual_raw="$(./bashunit --no-parallel --detailed --env "$TEST_ENV_FILE" "$test_file")"
18+
set -e
1919

20-
local actual
21-
actual="$(printf "%s" "$actual_raw" | strip_ansi)"
20+
local actual
21+
actual="$(printf "%s" "$actual_raw" | strip_ansi)"
2222

23-
assert_contains "failed" "$actual"
24-
assert_general_error "$(./bashunit --no-parallel --env "$TEST_ENV_FILE" "$test_file")"
23+
assert_contains "failed" "$actual"
24+
assert_general_error "$(./bashunit --no-parallel --env "$TEST_ENV_FILE" "$test_file")"
2525
}
2626

2727
function test_bashunit_when_set_up_before_script_sources_nonexistent_file() {
28-
local test_file=./tests/acceptance/fixtures/test_bashunit_when_setup_before_script_sources_nonexistent_file.sh
28+
local test_file=./tests/acceptance/fixtures/test_bashunit_when_setup_before_script_sources_nonexistent_file.sh
2929

30-
local actual_raw
31-
set +e
32-
actual_raw="$(./bashunit --no-parallel --detailed --env "$TEST_ENV_FILE" "$test_file")"
33-
set -e
30+
local actual_raw
31+
set +e
32+
actual_raw="$(./bashunit --no-parallel --detailed --env "$TEST_ENV_FILE" "$test_file")"
33+
set -e
3434

35-
local actual
36-
actual="$(printf "%s" "$actual_raw" | strip_ansi)"
35+
local actual
36+
actual="$(printf "%s" "$actual_raw" | strip_ansi)"
3737

38-
assert_contains "failed" "$actual"
39-
assert_general_error "$(./bashunit --no-parallel --env "$TEST_ENV_FILE" "$test_file")"
38+
assert_contains "failed" "$actual"
39+
assert_general_error "$(./bashunit --no-parallel --env "$TEST_ENV_FILE" "$test_file")"
4040
}
4141

4242
function test_bashunit_when_tear_down_after_script_sources_nonexistent_file() {
43-
local test_file=./tests/acceptance/fixtures/test_bashunit_when_teardown_after_script_sources_nonexistent_file.sh
43+
local test_file=./tests/acceptance/fixtures/test_bashunit_when_teardown_after_script_sources_nonexistent_file.sh
4444

45-
local actual_raw
46-
set +e
47-
actual_raw="$(./bashunit --no-parallel --detailed --env "$TEST_ENV_FILE" "$test_file")"
48-
set -e
45+
local actual_raw
46+
set +e
47+
actual_raw="$(./bashunit --no-parallel --detailed --env "$TEST_ENV_FILE" "$test_file")"
48+
set -e
4949

50-
local actual
51-
actual="$(printf "%s" "$actual_raw" | strip_ansi)"
50+
local actual
51+
actual="$(printf "%s" "$actual_raw" | strip_ansi)"
5252

53-
assert_contains "failed" "$actual"
54-
assert_general_error "$(./bashunit --no-parallel --env "$TEST_ENV_FILE" "$test_file")"
53+
assert_contains "failed" "$actual"
54+
assert_general_error "$(./bashunit --no-parallel --env "$TEST_ENV_FILE" "$test_file")"
5555
}

tests/acceptance/bashunit_risky_test.sh

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,37 +2,37 @@
22
set -euo pipefail
33

44
function set_up_before_script() {
5-
TEST_ENV_FILE="tests/acceptance/fixtures/.env.default"
5+
TEST_ENV_FILE="tests/acceptance/fixtures/.env.default"
66
}
77

88
function strip_ansi() {
9-
sed -E 's/\x1B\[[0-9;]*[A-Za-z]//g'
9+
sed -E 's/\x1B\[[0-9;]*[A-Za-z]//g'
1010
}
1111

1212
function test_bashunit_risky_test_shows_warning() {
13-
local test_file=./tests/acceptance/fixtures/test_bashunit_risky_no_assertions.sh
13+
local test_file=./tests/acceptance/fixtures/test_bashunit_risky_no_assertions.sh
1414

15-
local actual_raw
16-
actual_raw="$(BASHUNIT_STRICT_MODE=false ./bashunit \
17-
--no-parallel --detailed --skip-env-file --env "$TEST_ENV_FILE" "$test_file")"
15+
local actual_raw
16+
actual_raw="$(BASHUNIT_STRICT_MODE=false ./bashunit \
17+
--no-parallel --detailed --skip-env-file --env "$TEST_ENV_FILE" "$test_file")"
1818

19-
local actual
20-
actual="$(printf "%s" "$actual_raw" | strip_ansi)"
19+
local actual
20+
actual="$(printf "%s" "$actual_raw" | strip_ansi)"
2121

22-
assert_contains "Risky" "$actual"
23-
assert_contains "1 risky" "$actual"
22+
assert_contains "Risky" "$actual"
23+
assert_contains "1 risky" "$actual"
2424
}
2525

2626
function test_bashunit_risky_test_does_not_fail() {
27-
local test_file=./tests/acceptance/fixtures/test_bashunit_risky_no_assertions.sh
27+
local test_file=./tests/acceptance/fixtures/test_bashunit_risky_no_assertions.sh
2828

29-
local actual_raw
30-
actual_raw="$(BASHUNIT_STRICT_MODE=false ./bashunit \
31-
--no-parallel --simple --skip-env-file --env "$TEST_ENV_FILE" "$test_file")"
29+
local actual_raw
30+
actual_raw="$(BASHUNIT_STRICT_MODE=false ./bashunit \
31+
--no-parallel --simple --skip-env-file --env "$TEST_ENV_FILE" "$test_file")"
3232

33-
local actual
34-
actual="$(printf "%s" "$actual_raw" | strip_ansi)"
33+
local actual
34+
actual="$(printf "%s" "$actual_raw" | strip_ansi)"
3535

36-
assert_contains "risky" "$actual"
37-
assert_not_contains "failed" "$actual"
36+
assert_contains "risky" "$actual"
37+
assert_not_contains "failed" "$actual"
3838
}

tests/acceptance/fixtures/strict_mode_setup_unset_variable.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# shellcheck disable=SC2034
33

44
function set_up() {
5-
local result="prefix_${UNDEFINED_VAR}_suffix"
5+
local result="prefix_${UNDEFINED_VAR}_suffix"
66
}
77

88
function test_dummy() {
9-
assert_same "foo" "foo"
9+
assert_same "foo" "foo"
1010
}

tests/acceptance/fixtures/test_bashunit_risky_no_assertions.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
# shellcheck disable=SC2034
33

44
function test_has_no_assertions() {
5-
local user="invalid"
5+
local user="invalid"
66
}
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#!/usr/bin/env bash
22

33
function set_up_before_script() {
4-
# shellcheck disable=SC1091
5-
source ./this_file_does_not_exist.sh
4+
# shellcheck disable=SC1091
5+
source ./this_file_does_not_exist.sh
66
}
77

88
function test_dummy() {
9-
assert_same "foo" "foo"
9+
assert_same "foo" "foo"
1010
}
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#!/usr/bin/env bash
22

33
function tear_down_after_script() {
4-
# shellcheck disable=SC1091
5-
source ./this_file_does_not_exist.sh
4+
# shellcheck disable=SC1091
5+
source ./this_file_does_not_exist.sh
66
}
77

88
function test_dummy() {
9-
assert_same "foo" "foo"
9+
assert_same "foo" "foo"
1010
}
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#!/usr/bin/env bash
22

33
function tear_down() {
4-
# shellcheck disable=SC1091
5-
source ./this_file_does_not_exist.sh
4+
# shellcheck disable=SC1091
5+
source ./this_file_does_not_exist.sh
66
}
77

88
function test_dummy() {
9-
assert_same "foo" "foo"
9+
assert_same "foo" "foo"
1010
}

0 commit comments

Comments
 (0)