Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ function tear_down() {
}

function test_globals_current_dir() {
assert_same "tests/unit" "$(bashunit::current_dir)"
assert_same "tests/unit/api" "$(bashunit::current_dir)"
}

function test_globals_current_filename() {
Expand All@@ -38,7 +38,7 @@ function globals_test::call_caller_filename() {
}

function test_globals_caller_filename() {
assert_same "tests/unit" "$(globals_test::call_caller_filename)"
assert_same "tests/unit/api" "$(globals_test::call_caller_filename)"
}

function test_globals_caller_line() {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,7 +71,7 @@ function test_unsuccessful_spy_called_times() {

function test_successful_spy_with_source_function() {
# shellcheck source=/dev/null
source "$(bashunit::current_dir)/fixtures/fake_function_to_spy.sh"
source "$(bashunit::current_dir)/../fixtures/fake_function_to_spy.sh"
bashunit::spy function_to_be_spied_on

function_to_be_spied_on
Expand All@@ -81,7 +81,7 @@ function test_successful_spy_with_source_function() {

function test_unsuccessful_spy_with_source_function_have_been_called() {
# shellcheck source=/dev/null
source "$(bashunit::current_dir)/fixtures/fake_function_to_spy.sh"
source "$(bashunit::current_dir)/../fixtures/fake_function_to_spy.sh"
bashunit::spy function_to_be_spied_on

function_to_be_spied_on
Expand All@@ -99,7 +99,7 @@ function test_unsuccessful_spy_with_source_function_have_been_called() {

function test_successful_spy_called_times_with_source() {
# shellcheck source=/dev/null
source "$(bashunit::current_dir)/fixtures/fake_function_to_spy.sh"
source "$(bashunit::current_dir)/../fixtures/fake_function_to_spy.sh"
bashunit::spy function_to_be_spied_on

function_to_be_spied_on
Expand Down
40 changes: 20 additions & 20 deletions tests/unit/helpers_test.sh → tests/unit/helper/helper_test.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -125,28 +125,28 @@ function test_successful_unset_if_exists() {

function test_check_duplicate_functions_with_duplicates() {
local file
file="$(bashunit::current_dir)/fixtures/duplicate_functions.sh"
file="$(bashunit::current_dir)/../fixtures/duplicate_functions.sh"

assert_general_error "$(bashunit::helper::check_duplicate_functions "$file")"
}

function test_check_duplicate_functions_without_duplicates() {
local file
file="$(bashunit::current_dir)/fixtures/no_duplicate_functions.sh"
file="$(bashunit::current_dir)/../fixtures/no_duplicate_functions.sh"

assert_successful_code "$(bashunit::helper::check_duplicate_functions "$file")"
}

function test_check_duplicate_functions_without_function_keyword() {
local file
file="$(bashunit::current_dir)/fixtures/no_function_keyword_duplicates.sh"
file="$(bashunit::current_dir)/../fixtures/no_function_keyword_duplicates.sh"

assert_general_error "$(bashunit::helper::check_duplicate_functions "$file")"
}

function test_check_duplicate_functions_reports_each_duplicate_name_sorted() {
local file names
file="$(bashunit::current_dir)/fixtures/multiple_duplicate_functions.sh"
file="$(bashunit::current_dir)/../fixtures/multiple_duplicate_functions.sh"

# Isolate the state mutation in a subshell; report the stored duplicate names.
names=$(
Expand DownExpand Up@@ -255,7 +255,7 @@ function test_get_provider_data_should_returns_empty_when_not_exists_provider_fu
"$(bashunit::helper::get_provider_data "fake_function_get_not_existing_provider_data" "${BASH_SOURCE[0]}")"
}

FIXTURE_PROVIDER_MAP="$(dirname "${BASH_SOURCE[0]}")/fixtures/provider_map/sample_providers.sh"
FIXTURE_PROVIDER_MAP="$(dirname "${BASH_SOURCE[0]}")/../fixtures/provider_map/sample_providers.sh"

function provider_for() {
bashunit::helper::build_provider_map "$1"
Expand DownExpand Up@@ -324,7 +324,7 @@ function test_build_provider_map_no_parallel_marker_defaults_false() {

function test_find_files_recursive_given_file() {
local path
path="$(bashunit::current_dir)/fixtures/tests/example1_test.sh"
path="tests/unit/fixtures/tests/example1_test.sh"

local result
result=$(bashunit::helper::find_files_recursive "$path")
Expand All@@ -334,7 +334,7 @@ function test_find_files_recursive_given_file() {

function test_find_files_recursive_given_dir() {
local path
path="$(bashunit::current_dir)/fixtures/tests"
path="tests/unit/fixtures/tests"

local result
result=$(bashunit::helper::find_files_recursive "$path")
Expand All@@ -347,7 +347,7 @@ tests/unit/fixtures/tests/example3_test.bash" \

function test_find_files_recursive_given_wildcard() {
local path
path="$(bashunit::current_dir)/fixtures/tests/*2_test.sh"
path="tests/unit/fixtures/tests/*2_test.sh"

local result
result=$(bashunit::helper::find_files_recursive "$path")
Expand All@@ -357,7 +357,7 @@ function test_find_files_recursive_given_wildcard() {

function test_find_files_recursive_given_bash_extension() {
local path
path="$(bashunit::current_dir)/fixtures/tests/*3_test.bash"
path="tests/unit/fixtures/tests/*3_test.bash"

local result
result=$(bashunit::helper::find_files_recursive "$path")
Expand DownExpand Up@@ -465,39 +465,39 @@ function test_find_total_tests_no_files() {

function test_find_total_tests_simple_file() {
local file
file="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.sh"
file="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.sh"

assert_same "2" "$(helpers_test::find_total_in_subshell "" "$file")"
}

function test_find_total_tests_simple_file_bash() {
local file
file="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.bash"
file="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.bash"

assert_same "2" "$(helpers_test::find_total_in_subshell "" "$file")"
}

function test_find_total_tests_with_provider() {
local file
file="$(bashunit::current_dir)/fixtures/find_total_tests/provider_fixture.sh"
file="$(bashunit::current_dir)/../fixtures/find_total_tests/provider_fixture.sh"

assert_same "3" "$(helpers_test::find_total_in_subshell "" "$file")"
}

function test_find_total_tests_multiple_files() {
local file1
local file2
file1="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.sh"
file2="$(bashunit::current_dir)/fixtures/find_total_tests/provider_fixture.sh"
file1="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.sh"
file2="$(bashunit::current_dir)/../fixtures/find_total_tests/provider_fixture.sh"

assert_same "5" "$(helpers_test::find_total_in_subshell "" "$file1" "$file2")"
}

function test_find_total_tests_with_filter() {
local file1
local file2
file1="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.sh"
file2="$(bashunit::current_dir)/fixtures/find_total_tests/provider_fixture.sh"
file1="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.sh"
file2="$(bashunit::current_dir)/../fixtures/find_total_tests/provider_fixture.sh"

assert_same "3" "$(helpers_test::find_total_in_subshell "with_provider" "$file1" "$file2")"
}
Expand DownExpand Up@@ -574,28 +574,28 @@ function test_parse_file_path_filter_with_colon_in_path() {

function test_find_function_at_line_first_function() {
local file
file="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.sh"
file="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.sh"

assert_same "test_first" "$(bashunit::helper::find_function_at_line "$file" 4)"
}

function test_find_function_at_line_second_function() {
local file
file="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.sh"
file="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.sh"

assert_same "test_second" "$(bashunit::helper::find_function_at_line "$file" 8)"
}

function test_find_function_at_line_exact_function_line() {
local file
file="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.sh"
file="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.sh"

assert_same "test_first" "$(bashunit::helper::find_function_at_line "$file" 3)"
}

function test_find_function_at_line_before_any_function() {
local file
file="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.sh"
file="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.sh"

assert_same "" "$(bashunit::helper::find_function_at_line "$file" 1)"
}
Expand Down
File renamed without changes.
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
#!/usr/bin/env bash
# shellcheck disable=SC2317

FIXTURE_TAGS_MAP="$(dirname "${BASH_SOURCE[0]}")/fixtures/tags_map/sample_tags.sh"
FIXTURE_TAGS_MAP_OTHER="$(dirname "${BASH_SOURCE[0]}")/fixtures/tags_map/sample_tags_other.sh"
FIXTURE_TAGS_MAP="$(dirname "${BASH_SOURCE[0]}")/../fixtures/tags_map/sample_tags.sh"
FIXTURE_TAGS_MAP_OTHER="$(dirname "${BASH_SOURCE[0]}")/../fixtures/tags_map/sample_tags_other.sh"

function tags_for() {
bashunit::helper::build_tags_map "$1"
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ function _learn_in_sandbox() {
sandbox="$(bashunit::temp_dir)"
# Resolve the repo root from this test file, not $BASHUNIT_ROOT_DIR: under
# `build.sh --verify` the running binary's root dir has no src/ (#834).
root_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
root_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"
# stdin is /dev/null so the `read -p "Press Enter to continue..."` prompts in
# the interactive paths hit EOF and return instead of blocking the suite.
# BASHUNIT_ROOT_DIR is set INSIDE the child (run_lesson_test shells out to the
Expand Down
File renamed without changes.
File renamed without changes.
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
ROOT_DIR=""

function set_up_before_script() {
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"
}

function src_files_sourced_by_entrypoint() {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ PKG_FILE=""
DOCS_PKG_FILE=""

function set_up_before_script() {
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"
PKG_FILE="$ROOT_DIR/package.json"
DOCS_PKG_FILE="$ROOT_DIR/docs/package.json"
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@ RELEASE_SCRIPT_DIR=""
FIXTURES_DIR=""

function set_up_before_script() {
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
FIXTURES_DIR="$(dirname "${BASH_SOURCE[0]}")/fixtures/release"
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"
FIXTURES_DIR="$(dirname "${BASH_SOURCE[0]}")/../fixtures/release"

# Source release.sh to get access to functions
# shellcheck source=/dev/null
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ RELEASE_SCRIPT_DIR=""
FIXTURE_DIR=""

function set_up_before_script() {
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"

# Source release.sh to get access to functions
# shellcheck source=/dev/null
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@ RELEASE_SCRIPT_DIR=""
FIXTURES_DIR=""

function set_up_before_script() {
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
FIXTURES_DIR="$(dirname "${BASH_SOURCE[0]}")/fixtures/release"
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"
FIXTURES_DIR="$(dirname "${BASH_SOURCE[0]}")/../fixtures/release"

# Source release.sh to get access to functions
# shellcheck source=/dev/null
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@ RELEASE_SCRIPT_DIR=""
FIXTURES_DIR=""

function set_up_before_script() {
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
FIXTURES_DIR="$(dirname "${BASH_SOURCE[0]}")/fixtures/release"
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"
FIXTURES_DIR="$(dirname "${BASH_SOURCE[0]}")/../fixtures/release"

# Source release.sh to get access to functions
# shellcheck source=/dev/null
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ fi
RELEASE_SCRIPT_DIR=""

function set_up_before_script() {
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"

# Source release.sh to get access to functions
# shellcheck source=/dev/null
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line numberDiff line numberDiff line change
Expand Up@@ -85,7 +85,7 @@ function test_module_load_detects_os_with_a_single_uname_call() {
# under `build.sh --verify` the built bashunit lives in a folder
# without src/, and sourcing through $BASHUNIT_ROOT_DIR crashed
# the whole verification run (silently, until #834 gated it).
source "$(dirname "${BASH_SOURCE[0]}")/../../src/system/check_os.sh"
source "$(dirname "${BASH_SOURCE[0]}")/../../../src/system/check_os.sh"

assert_have_been_called_times 1 uname
}
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
refactor(tests): mirror the src/ module layout in tests/unit/ by Chemaclass · Pull Request #960 · TypedDevs/bashunit · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ function tear_down() {
}

function test_globals_current_dir() {
assert_same "tests/unit" "$(bashunit::current_dir)"
assert_same "tests/unit/api" "$(bashunit::current_dir)"
}

function test_globals_current_filename() {
Expand All@@ -38,7 +38,7 @@ function globals_test::call_caller_filename() {
}

function test_globals_caller_filename() {
assert_same "tests/unit" "$(globals_test::call_caller_filename)"
assert_same "tests/unit/api" "$(globals_test::call_caller_filename)"
}

function test_globals_caller_line() {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,7 +71,7 @@ function test_unsuccessful_spy_called_times() {

function test_successful_spy_with_source_function() {
# shellcheck source=/dev/null
source "$(bashunit::current_dir)/fixtures/fake_function_to_spy.sh"
source "$(bashunit::current_dir)/../fixtures/fake_function_to_spy.sh"
bashunit::spy function_to_be_spied_on

function_to_be_spied_on
Expand All@@ -81,7 +81,7 @@ function test_successful_spy_with_source_function() {

function test_unsuccessful_spy_with_source_function_have_been_called() {
# shellcheck source=/dev/null
source "$(bashunit::current_dir)/fixtures/fake_function_to_spy.sh"
source "$(bashunit::current_dir)/../fixtures/fake_function_to_spy.sh"
bashunit::spy function_to_be_spied_on

function_to_be_spied_on
Expand All@@ -99,7 +99,7 @@ function test_unsuccessful_spy_with_source_function_have_been_called() {

function test_successful_spy_called_times_with_source() {
# shellcheck source=/dev/null
source "$(bashunit::current_dir)/fixtures/fake_function_to_spy.sh"
source "$(bashunit::current_dir)/../fixtures/fake_function_to_spy.sh"
bashunit::spy function_to_be_spied_on

function_to_be_spied_on
Expand Down
40 changes: 20 additions & 20 deletions tests/unit/helpers_test.sh → tests/unit/helper/helper_test.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -125,28 +125,28 @@ function test_successful_unset_if_exists() {

function test_check_duplicate_functions_with_duplicates() {
local file
file="$(bashunit::current_dir)/fixtures/duplicate_functions.sh"
file="$(bashunit::current_dir)/../fixtures/duplicate_functions.sh"

assert_general_error "$(bashunit::helper::check_duplicate_functions "$file")"
}

function test_check_duplicate_functions_without_duplicates() {
local file
file="$(bashunit::current_dir)/fixtures/no_duplicate_functions.sh"
file="$(bashunit::current_dir)/../fixtures/no_duplicate_functions.sh"

assert_successful_code "$(bashunit::helper::check_duplicate_functions "$file")"
}

function test_check_duplicate_functions_without_function_keyword() {
local file
file="$(bashunit::current_dir)/fixtures/no_function_keyword_duplicates.sh"
file="$(bashunit::current_dir)/../fixtures/no_function_keyword_duplicates.sh"

assert_general_error "$(bashunit::helper::check_duplicate_functions "$file")"
}

function test_check_duplicate_functions_reports_each_duplicate_name_sorted() {
local file names
file="$(bashunit::current_dir)/fixtures/multiple_duplicate_functions.sh"
file="$(bashunit::current_dir)/../fixtures/multiple_duplicate_functions.sh"

# Isolate the state mutation in a subshell; report the stored duplicate names.
names=$(
Expand DownExpand Up@@ -255,7 +255,7 @@ function test_get_provider_data_should_returns_empty_when_not_exists_provider_fu
"$(bashunit::helper::get_provider_data "fake_function_get_not_existing_provider_data" "${BASH_SOURCE[0]}")"
}

FIXTURE_PROVIDER_MAP="$(dirname "${BASH_SOURCE[0]}")/fixtures/provider_map/sample_providers.sh"
FIXTURE_PROVIDER_MAP="$(dirname "${BASH_SOURCE[0]}")/../fixtures/provider_map/sample_providers.sh"

function provider_for() {
bashunit::helper::build_provider_map "$1"
Expand DownExpand Up@@ -324,7 +324,7 @@ function test_build_provider_map_no_parallel_marker_defaults_false() {

function test_find_files_recursive_given_file() {
local path
path="$(bashunit::current_dir)/fixtures/tests/example1_test.sh"
path="tests/unit/fixtures/tests/example1_test.sh"

local result
result=$(bashunit::helper::find_files_recursive "$path")
Expand All@@ -334,7 +334,7 @@ function test_find_files_recursive_given_file() {

function test_find_files_recursive_given_dir() {
local path
path="$(bashunit::current_dir)/fixtures/tests"
path="tests/unit/fixtures/tests"

local result
result=$(bashunit::helper::find_files_recursive "$path")
Expand All@@ -347,7 +347,7 @@ tests/unit/fixtures/tests/example3_test.bash" \

function test_find_files_recursive_given_wildcard() {
local path
path="$(bashunit::current_dir)/fixtures/tests/*2_test.sh"
path="tests/unit/fixtures/tests/*2_test.sh"

local result
result=$(bashunit::helper::find_files_recursive "$path")
Expand All@@ -357,7 +357,7 @@ function test_find_files_recursive_given_wildcard() {

function test_find_files_recursive_given_bash_extension() {
local path
path="$(bashunit::current_dir)/fixtures/tests/*3_test.bash"
path="tests/unit/fixtures/tests/*3_test.bash"

local result
result=$(bashunit::helper::find_files_recursive "$path")
Expand DownExpand Up@@ -465,39 +465,39 @@ function test_find_total_tests_no_files() {

function test_find_total_tests_simple_file() {
local file
file="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.sh"
file="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.sh"

assert_same "2" "$(helpers_test::find_total_in_subshell "" "$file")"
}

function test_find_total_tests_simple_file_bash() {
local file
file="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.bash"
file="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.bash"

assert_same "2" "$(helpers_test::find_total_in_subshell "" "$file")"
}

function test_find_total_tests_with_provider() {
local file
file="$(bashunit::current_dir)/fixtures/find_total_tests/provider_fixture.sh"
file="$(bashunit::current_dir)/../fixtures/find_total_tests/provider_fixture.sh"

assert_same "3" "$(helpers_test::find_total_in_subshell "" "$file")"
}

function test_find_total_tests_multiple_files() {
local file1
local file2
file1="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.sh"
file2="$(bashunit::current_dir)/fixtures/find_total_tests/provider_fixture.sh"
file1="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.sh"
file2="$(bashunit::current_dir)/../fixtures/find_total_tests/provider_fixture.sh"

assert_same "5" "$(helpers_test::find_total_in_subshell "" "$file1" "$file2")"
}

function test_find_total_tests_with_filter() {
local file1
local file2
file1="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.sh"
file2="$(bashunit::current_dir)/fixtures/find_total_tests/provider_fixture.sh"
file1="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.sh"
file2="$(bashunit::current_dir)/../fixtures/find_total_tests/provider_fixture.sh"

assert_same "3" "$(helpers_test::find_total_in_subshell "with_provider" "$file1" "$file2")"
}
Expand DownExpand Up@@ -574,28 +574,28 @@ function test_parse_file_path_filter_with_colon_in_path() {

function test_find_function_at_line_first_function() {
local file
file="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.sh"
file="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.sh"

assert_same "test_first" "$(bashunit::helper::find_function_at_line "$file" 4)"
}

function test_find_function_at_line_second_function() {
local file
file="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.sh"
file="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.sh"

assert_same "test_second" "$(bashunit::helper::find_function_at_line "$file" 8)"
}

function test_find_function_at_line_exact_function_line() {
local file
file="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.sh"
file="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.sh"

assert_same "test_first" "$(bashunit::helper::find_function_at_line "$file" 3)"
}

function test_find_function_at_line_before_any_function() {
local file
file="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.sh"
file="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.sh"

assert_same "" "$(bashunit::helper::find_function_at_line "$file" 1)"
}
Expand Down
File renamed without changes.
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
#!/usr/bin/env bash
# shellcheck disable=SC2317

FIXTURE_TAGS_MAP="$(dirname "${BASH_SOURCE[0]}")/fixtures/tags_map/sample_tags.sh"
FIXTURE_TAGS_MAP_OTHER="$(dirname "${BASH_SOURCE[0]}")/fixtures/tags_map/sample_tags_other.sh"
FIXTURE_TAGS_MAP="$(dirname "${BASH_SOURCE[0]}")/../fixtures/tags_map/sample_tags.sh"
FIXTURE_TAGS_MAP_OTHER="$(dirname "${BASH_SOURCE[0]}")/../fixtures/tags_map/sample_tags_other.sh"

function tags_for() {
bashunit::helper::build_tags_map "$1"
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ function _learn_in_sandbox() {
sandbox="$(bashunit::temp_dir)"
# Resolve the repo root from this test file, not $BASHUNIT_ROOT_DIR: under
# `build.sh --verify` the running binary's root dir has no src/ (#834).
root_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
root_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"
# stdin is /dev/null so the `read -p "Press Enter to continue..."` prompts in
# the interactive paths hit EOF and return instead of blocking the suite.
# BASHUNIT_ROOT_DIR is set INSIDE the child (run_lesson_test shells out to the
Expand Down
File renamed without changes.
File renamed without changes.
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
ROOT_DIR=""

function set_up_before_script() {
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"
}

function src_files_sourced_by_entrypoint() {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ PKG_FILE=""
DOCS_PKG_FILE=""

function set_up_before_script() {
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"
PKG_FILE="$ROOT_DIR/package.json"
DOCS_PKG_FILE="$ROOT_DIR/docs/package.json"
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@ RELEASE_SCRIPT_DIR=""
FIXTURES_DIR=""

function set_up_before_script() {
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
FIXTURES_DIR="$(dirname "${BASH_SOURCE[0]}")/fixtures/release"
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"
FIXTURES_DIR="$(dirname "${BASH_SOURCE[0]}")/../fixtures/release"

# Source release.sh to get access to functions
# shellcheck source=/dev/null
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ RELEASE_SCRIPT_DIR=""
FIXTURE_DIR=""

function set_up_before_script() {
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"

# Source release.sh to get access to functions
# shellcheck source=/dev/null
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@ RELEASE_SCRIPT_DIR=""
FIXTURES_DIR=""

function set_up_before_script() {
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
FIXTURES_DIR="$(dirname "${BASH_SOURCE[0]}")/fixtures/release"
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"
FIXTURES_DIR="$(dirname "${BASH_SOURCE[0]}")/../fixtures/release"

# Source release.sh to get access to functions
# shellcheck source=/dev/null
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@ RELEASE_SCRIPT_DIR=""
FIXTURES_DIR=""

function set_up_before_script() {
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
FIXTURES_DIR="$(dirname "${BASH_SOURCE[0]}")/fixtures/release"
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"
FIXTURES_DIR="$(dirname "${BASH_SOURCE[0]}")/../fixtures/release"

# Source release.sh to get access to functions
# shellcheck source=/dev/null
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ fi
RELEASE_SCRIPT_DIR=""

function set_up_before_script() {
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"

# Source release.sh to get access to functions
# shellcheck source=/dev/null
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line numberDiff line numberDiff line change
Expand Up@@ -85,7 +85,7 @@ function test_module_load_detects_os_with_a_single_uname_call() {
# under `build.sh --verify` the built bashunit lives in a folder
# without src/, and sourcing through $BASHUNIT_ROOT_DIR crashed
# the whole verification run (silently, until #834 gated it).
source "$(dirname "${BASH_SOURCE[0]}")/../../src/system/check_os.sh"
source "$(dirname "${BASH_SOURCE[0]}")/../../../src/system/check_os.sh"

assert_have_been_called_times 1 uname
}
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' refactor(tests): mirror the src/ module layout in tests/unit/ by Chemaclass · Pull Request #960 · TypedDevs/bashunit · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ function tear_down() {
}

function test_globals_current_dir() {
assert_same "tests/unit" "$(bashunit::current_dir)"
assert_same "tests/unit/api" "$(bashunit::current_dir)"
}

function test_globals_current_filename() {
Expand All@@ -38,7 +38,7 @@ function globals_test::call_caller_filename() {
}

function test_globals_caller_filename() {
assert_same "tests/unit" "$(globals_test::call_caller_filename)"
assert_same "tests/unit/api" "$(globals_test::call_caller_filename)"
}

function test_globals_caller_line() {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,7 +71,7 @@ function test_unsuccessful_spy_called_times() {

function test_successful_spy_with_source_function() {
# shellcheck source=/dev/null
source "$(bashunit::current_dir)/fixtures/fake_function_to_spy.sh"
source "$(bashunit::current_dir)/../fixtures/fake_function_to_spy.sh"
bashunit::spy function_to_be_spied_on

function_to_be_spied_on
Expand All@@ -81,7 +81,7 @@ function test_successful_spy_with_source_function() {

function test_unsuccessful_spy_with_source_function_have_been_called() {
# shellcheck source=/dev/null
source "$(bashunit::current_dir)/fixtures/fake_function_to_spy.sh"
source "$(bashunit::current_dir)/../fixtures/fake_function_to_spy.sh"
bashunit::spy function_to_be_spied_on

function_to_be_spied_on
Expand All@@ -99,7 +99,7 @@ function test_unsuccessful_spy_with_source_function_have_been_called() {

function test_successful_spy_called_times_with_source() {
# shellcheck source=/dev/null
source "$(bashunit::current_dir)/fixtures/fake_function_to_spy.sh"
source "$(bashunit::current_dir)/../fixtures/fake_function_to_spy.sh"
bashunit::spy function_to_be_spied_on

function_to_be_spied_on
Expand Down
40 changes: 20 additions & 20 deletions tests/unit/helpers_test.sh → tests/unit/helper/helper_test.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -125,28 +125,28 @@ function test_successful_unset_if_exists() {

function test_check_duplicate_functions_with_duplicates() {
local file
file="$(bashunit::current_dir)/fixtures/duplicate_functions.sh"
file="$(bashunit::current_dir)/../fixtures/duplicate_functions.sh"

assert_general_error "$(bashunit::helper::check_duplicate_functions "$file")"
}

function test_check_duplicate_functions_without_duplicates() {
local file
file="$(bashunit::current_dir)/fixtures/no_duplicate_functions.sh"
file="$(bashunit::current_dir)/../fixtures/no_duplicate_functions.sh"

assert_successful_code "$(bashunit::helper::check_duplicate_functions "$file")"
}

function test_check_duplicate_functions_without_function_keyword() {
local file
file="$(bashunit::current_dir)/fixtures/no_function_keyword_duplicates.sh"
file="$(bashunit::current_dir)/../fixtures/no_function_keyword_duplicates.sh"

assert_general_error "$(bashunit::helper::check_duplicate_functions "$file")"
}

function test_check_duplicate_functions_reports_each_duplicate_name_sorted() {
local file names
file="$(bashunit::current_dir)/fixtures/multiple_duplicate_functions.sh"
file="$(bashunit::current_dir)/../fixtures/multiple_duplicate_functions.sh"

# Isolate the state mutation in a subshell; report the stored duplicate names.
names=$(
Expand DownExpand Up@@ -255,7 +255,7 @@ function test_get_provider_data_should_returns_empty_when_not_exists_provider_fu
"$(bashunit::helper::get_provider_data "fake_function_get_not_existing_provider_data" "${BASH_SOURCE[0]}")"
}

FIXTURE_PROVIDER_MAP="$(dirname "${BASH_SOURCE[0]}")/fixtures/provider_map/sample_providers.sh"
FIXTURE_PROVIDER_MAP="$(dirname "${BASH_SOURCE[0]}")/../fixtures/provider_map/sample_providers.sh"

function provider_for() {
bashunit::helper::build_provider_map "$1"
Expand DownExpand Up@@ -324,7 +324,7 @@ function test_build_provider_map_no_parallel_marker_defaults_false() {

function test_find_files_recursive_given_file() {
local path
path="$(bashunit::current_dir)/fixtures/tests/example1_test.sh"
path="tests/unit/fixtures/tests/example1_test.sh"

local result
result=$(bashunit::helper::find_files_recursive "$path")
Expand All@@ -334,7 +334,7 @@ function test_find_files_recursive_given_file() {

function test_find_files_recursive_given_dir() {
local path
path="$(bashunit::current_dir)/fixtures/tests"
path="tests/unit/fixtures/tests"

local result
result=$(bashunit::helper::find_files_recursive "$path")
Expand All@@ -347,7 +347,7 @@ tests/unit/fixtures/tests/example3_test.bash" \

function test_find_files_recursive_given_wildcard() {
local path
path="$(bashunit::current_dir)/fixtures/tests/*2_test.sh"
path="tests/unit/fixtures/tests/*2_test.sh"

local result
result=$(bashunit::helper::find_files_recursive "$path")
Expand All@@ -357,7 +357,7 @@ function test_find_files_recursive_given_wildcard() {

function test_find_files_recursive_given_bash_extension() {
local path
path="$(bashunit::current_dir)/fixtures/tests/*3_test.bash"
path="tests/unit/fixtures/tests/*3_test.bash"

local result
result=$(bashunit::helper::find_files_recursive "$path")
Expand DownExpand Up@@ -465,39 +465,39 @@ function test_find_total_tests_no_files() {

function test_find_total_tests_simple_file() {
local file
file="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.sh"
file="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.sh"

assert_same "2" "$(helpers_test::find_total_in_subshell "" "$file")"
}

function test_find_total_tests_simple_file_bash() {
local file
file="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.bash"
file="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.bash"

assert_same "2" "$(helpers_test::find_total_in_subshell "" "$file")"
}

function test_find_total_tests_with_provider() {
local file
file="$(bashunit::current_dir)/fixtures/find_total_tests/provider_fixture.sh"
file="$(bashunit::current_dir)/../fixtures/find_total_tests/provider_fixture.sh"

assert_same "3" "$(helpers_test::find_total_in_subshell "" "$file")"
}

function test_find_total_tests_multiple_files() {
local file1
local file2
file1="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.sh"
file2="$(bashunit::current_dir)/fixtures/find_total_tests/provider_fixture.sh"
file1="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.sh"
file2="$(bashunit::current_dir)/../fixtures/find_total_tests/provider_fixture.sh"

assert_same "5" "$(helpers_test::find_total_in_subshell "" "$file1" "$file2")"
}

function test_find_total_tests_with_filter() {
local file1
local file2
file1="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.sh"
file2="$(bashunit::current_dir)/fixtures/find_total_tests/provider_fixture.sh"
file1="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.sh"
file2="$(bashunit::current_dir)/../fixtures/find_total_tests/provider_fixture.sh"

assert_same "3" "$(helpers_test::find_total_in_subshell "with_provider" "$file1" "$file2")"
}
Expand DownExpand Up@@ -574,28 +574,28 @@ function test_parse_file_path_filter_with_colon_in_path() {

function test_find_function_at_line_first_function() {
local file
file="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.sh"
file="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.sh"

assert_same "test_first" "$(bashunit::helper::find_function_at_line "$file" 4)"
}

function test_find_function_at_line_second_function() {
local file
file="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.sh"
file="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.sh"

assert_same "test_second" "$(bashunit::helper::find_function_at_line "$file" 8)"
}

function test_find_function_at_line_exact_function_line() {
local file
file="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.sh"
file="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.sh"

assert_same "test_first" "$(bashunit::helper::find_function_at_line "$file" 3)"
}

function test_find_function_at_line_before_any_function() {
local file
file="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.sh"
file="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.sh"

assert_same "" "$(bashunit::helper::find_function_at_line "$file" 1)"
}
Expand Down
File renamed without changes.
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
#!/usr/bin/env bash
# shellcheck disable=SC2317

FIXTURE_TAGS_MAP="$(dirname "${BASH_SOURCE[0]}")/fixtures/tags_map/sample_tags.sh"
FIXTURE_TAGS_MAP_OTHER="$(dirname "${BASH_SOURCE[0]}")/fixtures/tags_map/sample_tags_other.sh"
FIXTURE_TAGS_MAP="$(dirname "${BASH_SOURCE[0]}")/../fixtures/tags_map/sample_tags.sh"
FIXTURE_TAGS_MAP_OTHER="$(dirname "${BASH_SOURCE[0]}")/../fixtures/tags_map/sample_tags_other.sh"

function tags_for() {
bashunit::helper::build_tags_map "$1"
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ function _learn_in_sandbox() {
sandbox="$(bashunit::temp_dir)"
# Resolve the repo root from this test file, not $BASHUNIT_ROOT_DIR: under
# `build.sh --verify` the running binary's root dir has no src/ (#834).
root_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
root_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"
# stdin is /dev/null so the `read -p "Press Enter to continue..."` prompts in
# the interactive paths hit EOF and return instead of blocking the suite.
# BASHUNIT_ROOT_DIR is set INSIDE the child (run_lesson_test shells out to the
Expand Down
File renamed without changes.
File renamed without changes.
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
ROOT_DIR=""

function set_up_before_script() {
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"
}

function src_files_sourced_by_entrypoint() {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ PKG_FILE=""
DOCS_PKG_FILE=""

function set_up_before_script() {
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"
PKG_FILE="$ROOT_DIR/package.json"
DOCS_PKG_FILE="$ROOT_DIR/docs/package.json"
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@ RELEASE_SCRIPT_DIR=""
FIXTURES_DIR=""

function set_up_before_script() {
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
FIXTURES_DIR="$(dirname "${BASH_SOURCE[0]}")/fixtures/release"
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"
FIXTURES_DIR="$(dirname "${BASH_SOURCE[0]}")/../fixtures/release"

# Source release.sh to get access to functions
# shellcheck source=/dev/null
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ RELEASE_SCRIPT_DIR=""
FIXTURE_DIR=""

function set_up_before_script() {
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"

# Source release.sh to get access to functions
# shellcheck source=/dev/null
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@ RELEASE_SCRIPT_DIR=""
FIXTURES_DIR=""

function set_up_before_script() {
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
FIXTURES_DIR="$(dirname "${BASH_SOURCE[0]}")/fixtures/release"
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"
FIXTURES_DIR="$(dirname "${BASH_SOURCE[0]}")/../fixtures/release"

# Source release.sh to get access to functions
# shellcheck source=/dev/null
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@ RELEASE_SCRIPT_DIR=""
FIXTURES_DIR=""

function set_up_before_script() {
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
FIXTURES_DIR="$(dirname "${BASH_SOURCE[0]}")/fixtures/release"
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"
FIXTURES_DIR="$(dirname "${BASH_SOURCE[0]}")/../fixtures/release"

# Source release.sh to get access to functions
# shellcheck source=/dev/null
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ fi
RELEASE_SCRIPT_DIR=""

function set_up_before_script() {
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"

# Source release.sh to get access to functions
# shellcheck source=/dev/null
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line numberDiff line numberDiff line change
Expand Up@@ -85,7 +85,7 @@ function test_module_load_detects_os_with_a_single_uname_call() {
# under `build.sh --verify` the built bashunit lives in a folder
# without src/, and sourcing through $BASHUNIT_ROOT_DIR crashed
# the whole verification run (silently, until #834 gated it).
source "$(dirname "${BASH_SOURCE[0]}")/../../src/system/check_os.sh"
source "$(dirname "${BASH_SOURCE[0]}")/../../../src/system/check_os.sh"

assert_have_been_called_times 1 uname
}
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' refactor(tests): mirror the src/ module layout in tests/unit/ by Chemaclass · Pull Request #960 · TypedDevs/bashunit · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ function tear_down() {
}

function test_globals_current_dir() {
assert_same "tests/unit" "$(bashunit::current_dir)"
assert_same "tests/unit/api" "$(bashunit::current_dir)"
}

function test_globals_current_filename() {
Expand All@@ -38,7 +38,7 @@ function globals_test::call_caller_filename() {
}

function test_globals_caller_filename() {
assert_same "tests/unit" "$(globals_test::call_caller_filename)"
assert_same "tests/unit/api" "$(globals_test::call_caller_filename)"
}

function test_globals_caller_line() {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,7 +71,7 @@ function test_unsuccessful_spy_called_times() {

function test_successful_spy_with_source_function() {
# shellcheck source=/dev/null
source "$(bashunit::current_dir)/fixtures/fake_function_to_spy.sh"
source "$(bashunit::current_dir)/../fixtures/fake_function_to_spy.sh"
bashunit::spy function_to_be_spied_on

function_to_be_spied_on
Expand All@@ -81,7 +81,7 @@ function test_successful_spy_with_source_function() {

function test_unsuccessful_spy_with_source_function_have_been_called() {
# shellcheck source=/dev/null
source "$(bashunit::current_dir)/fixtures/fake_function_to_spy.sh"
source "$(bashunit::current_dir)/../fixtures/fake_function_to_spy.sh"
bashunit::spy function_to_be_spied_on

function_to_be_spied_on
Expand All@@ -99,7 +99,7 @@ function test_unsuccessful_spy_with_source_function_have_been_called() {

function test_successful_spy_called_times_with_source() {
# shellcheck source=/dev/null
source "$(bashunit::current_dir)/fixtures/fake_function_to_spy.sh"
source "$(bashunit::current_dir)/../fixtures/fake_function_to_spy.sh"
bashunit::spy function_to_be_spied_on

function_to_be_spied_on
Expand Down
40 changes: 20 additions & 20 deletions tests/unit/helpers_test.sh → tests/unit/helper/helper_test.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -125,28 +125,28 @@ function test_successful_unset_if_exists() {

function test_check_duplicate_functions_with_duplicates() {
local file
file="$(bashunit::current_dir)/fixtures/duplicate_functions.sh"
file="$(bashunit::current_dir)/../fixtures/duplicate_functions.sh"

assert_general_error "$(bashunit::helper::check_duplicate_functions "$file")"
}

function test_check_duplicate_functions_without_duplicates() {
local file
file="$(bashunit::current_dir)/fixtures/no_duplicate_functions.sh"
file="$(bashunit::current_dir)/../fixtures/no_duplicate_functions.sh"

assert_successful_code "$(bashunit::helper::check_duplicate_functions "$file")"
}

function test_check_duplicate_functions_without_function_keyword() {
local file
file="$(bashunit::current_dir)/fixtures/no_function_keyword_duplicates.sh"
file="$(bashunit::current_dir)/../fixtures/no_function_keyword_duplicates.sh"

assert_general_error "$(bashunit::helper::check_duplicate_functions "$file")"
}

function test_check_duplicate_functions_reports_each_duplicate_name_sorted() {
local file names
file="$(bashunit::current_dir)/fixtures/multiple_duplicate_functions.sh"
file="$(bashunit::current_dir)/../fixtures/multiple_duplicate_functions.sh"

# Isolate the state mutation in a subshell; report the stored duplicate names.
names=$(
Expand DownExpand Up@@ -255,7 +255,7 @@ function test_get_provider_data_should_returns_empty_when_not_exists_provider_fu
"$(bashunit::helper::get_provider_data "fake_function_get_not_existing_provider_data" "${BASH_SOURCE[0]}")"
}

FIXTURE_PROVIDER_MAP="$(dirname "${BASH_SOURCE[0]}")/fixtures/provider_map/sample_providers.sh"
FIXTURE_PROVIDER_MAP="$(dirname "${BASH_SOURCE[0]}")/../fixtures/provider_map/sample_providers.sh"

function provider_for() {
bashunit::helper::build_provider_map "$1"
Expand DownExpand Up@@ -324,7 +324,7 @@ function test_build_provider_map_no_parallel_marker_defaults_false() {

function test_find_files_recursive_given_file() {
local path
path="$(bashunit::current_dir)/fixtures/tests/example1_test.sh"
path="tests/unit/fixtures/tests/example1_test.sh"

local result
result=$(bashunit::helper::find_files_recursive "$path")
Expand All@@ -334,7 +334,7 @@ function test_find_files_recursive_given_file() {

function test_find_files_recursive_given_dir() {
local path
path="$(bashunit::current_dir)/fixtures/tests"
path="tests/unit/fixtures/tests"

local result
result=$(bashunit::helper::find_files_recursive "$path")
Expand All@@ -347,7 +347,7 @@ tests/unit/fixtures/tests/example3_test.bash" \

function test_find_files_recursive_given_wildcard() {
local path
path="$(bashunit::current_dir)/fixtures/tests/*2_test.sh"
path="tests/unit/fixtures/tests/*2_test.sh"

local result
result=$(bashunit::helper::find_files_recursive "$path")
Expand All@@ -357,7 +357,7 @@ function test_find_files_recursive_given_wildcard() {

function test_find_files_recursive_given_bash_extension() {
local path
path="$(bashunit::current_dir)/fixtures/tests/*3_test.bash"
path="tests/unit/fixtures/tests/*3_test.bash"

local result
result=$(bashunit::helper::find_files_recursive "$path")
Expand DownExpand Up@@ -465,39 +465,39 @@ function test_find_total_tests_no_files() {

function test_find_total_tests_simple_file() {
local file
file="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.sh"
file="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.sh"

assert_same "2" "$(helpers_test::find_total_in_subshell "" "$file")"
}

function test_find_total_tests_simple_file_bash() {
local file
file="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.bash"
file="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.bash"

assert_same "2" "$(helpers_test::find_total_in_subshell "" "$file")"
}

function test_find_total_tests_with_provider() {
local file
file="$(bashunit::current_dir)/fixtures/find_total_tests/provider_fixture.sh"
file="$(bashunit::current_dir)/../fixtures/find_total_tests/provider_fixture.sh"

assert_same "3" "$(helpers_test::find_total_in_subshell "" "$file")"
}

function test_find_total_tests_multiple_files() {
local file1
local file2
file1="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.sh"
file2="$(bashunit::current_dir)/fixtures/find_total_tests/provider_fixture.sh"
file1="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.sh"
file2="$(bashunit::current_dir)/../fixtures/find_total_tests/provider_fixture.sh"

assert_same "5" "$(helpers_test::find_total_in_subshell "" "$file1" "$file2")"
}

function test_find_total_tests_with_filter() {
local file1
local file2
file1="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.sh"
file2="$(bashunit::current_dir)/fixtures/find_total_tests/provider_fixture.sh"
file1="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.sh"
file2="$(bashunit::current_dir)/../fixtures/find_total_tests/provider_fixture.sh"

assert_same "3" "$(helpers_test::find_total_in_subshell "with_provider" "$file1" "$file2")"
}
Expand DownExpand Up@@ -574,28 +574,28 @@ function test_parse_file_path_filter_with_colon_in_path() {

function test_find_function_at_line_first_function() {
local file
file="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.sh"
file="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.sh"

assert_same "test_first" "$(bashunit::helper::find_function_at_line "$file" 4)"
}

function test_find_function_at_line_second_function() {
local file
file="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.sh"
file="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.sh"

assert_same "test_second" "$(bashunit::helper::find_function_at_line "$file" 8)"
}

function test_find_function_at_line_exact_function_line() {
local file
file="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.sh"
file="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.sh"

assert_same "test_first" "$(bashunit::helper::find_function_at_line "$file" 3)"
}

function test_find_function_at_line_before_any_function() {
local file
file="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.sh"
file="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.sh"

assert_same "" "$(bashunit::helper::find_function_at_line "$file" 1)"
}
Expand Down
File renamed without changes.
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
#!/usr/bin/env bash
# shellcheck disable=SC2317

FIXTURE_TAGS_MAP="$(dirname "${BASH_SOURCE[0]}")/fixtures/tags_map/sample_tags.sh"
FIXTURE_TAGS_MAP_OTHER="$(dirname "${BASH_SOURCE[0]}")/fixtures/tags_map/sample_tags_other.sh"
FIXTURE_TAGS_MAP="$(dirname "${BASH_SOURCE[0]}")/../fixtures/tags_map/sample_tags.sh"
FIXTURE_TAGS_MAP_OTHER="$(dirname "${BASH_SOURCE[0]}")/../fixtures/tags_map/sample_tags_other.sh"

function tags_for() {
bashunit::helper::build_tags_map "$1"
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ function _learn_in_sandbox() {
sandbox="$(bashunit::temp_dir)"
# Resolve the repo root from this test file, not $BASHUNIT_ROOT_DIR: under
# `build.sh --verify` the running binary's root dir has no src/ (#834).
root_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
root_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"
# stdin is /dev/null so the `read -p "Press Enter to continue..."` prompts in
# the interactive paths hit EOF and return instead of blocking the suite.
# BASHUNIT_ROOT_DIR is set INSIDE the child (run_lesson_test shells out to the
Expand Down
File renamed without changes.
File renamed without changes.
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
ROOT_DIR=""

function set_up_before_script() {
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"
}

function src_files_sourced_by_entrypoint() {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ PKG_FILE=""
DOCS_PKG_FILE=""

function set_up_before_script() {
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"
PKG_FILE="$ROOT_DIR/package.json"
DOCS_PKG_FILE="$ROOT_DIR/docs/package.json"
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@ RELEASE_SCRIPT_DIR=""
FIXTURES_DIR=""

function set_up_before_script() {
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
FIXTURES_DIR="$(dirname "${BASH_SOURCE[0]}")/fixtures/release"
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"
FIXTURES_DIR="$(dirname "${BASH_SOURCE[0]}")/../fixtures/release"

# Source release.sh to get access to functions
# shellcheck source=/dev/null
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ RELEASE_SCRIPT_DIR=""
FIXTURE_DIR=""

function set_up_before_script() {
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"

# Source release.sh to get access to functions
# shellcheck source=/dev/null
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@ RELEASE_SCRIPT_DIR=""
FIXTURES_DIR=""

function set_up_before_script() {
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
FIXTURES_DIR="$(dirname "${BASH_SOURCE[0]}")/fixtures/release"
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"
FIXTURES_DIR="$(dirname "${BASH_SOURCE[0]}")/../fixtures/release"

# Source release.sh to get access to functions
# shellcheck source=/dev/null
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@ RELEASE_SCRIPT_DIR=""
FIXTURES_DIR=""

function set_up_before_script() {
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
FIXTURES_DIR="$(dirname "${BASH_SOURCE[0]}")/fixtures/release"
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"
FIXTURES_DIR="$(dirname "${BASH_SOURCE[0]}")/../fixtures/release"

# Source release.sh to get access to functions
# shellcheck source=/dev/null
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ fi
RELEASE_SCRIPT_DIR=""

function set_up_before_script() {
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"

# Source release.sh to get access to functions
# shellcheck source=/dev/null
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line numberDiff line numberDiff line change
Expand Up@@ -85,7 +85,7 @@ function test_module_load_detects_os_with_a_single_uname_call() {
# under `build.sh --verify` the built bashunit lives in a folder
# without src/, and sourcing through $BASHUNIT_ROOT_DIR crashed
# the whole verification run (silently, until #834 gated it).
source "$(dirname "${BASH_SOURCE[0]}")/../../src/system/check_os.sh"
source "$(dirname "${BASH_SOURCE[0]}")/../../../src/system/check_os.sh"

assert_have_been_called_times 1 uname
}
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' refactor(tests): mirror the src/ module layout in tests/unit/ by Chemaclass · Pull Request #960 · TypedDevs/bashunit · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ function tear_down() {
}

function test_globals_current_dir() {
assert_same "tests/unit" "$(bashunit::current_dir)"
assert_same "tests/unit/api" "$(bashunit::current_dir)"
}

function test_globals_current_filename() {
Expand All@@ -38,7 +38,7 @@ function globals_test::call_caller_filename() {
}

function test_globals_caller_filename() {
assert_same "tests/unit" "$(globals_test::call_caller_filename)"
assert_same "tests/unit/api" "$(globals_test::call_caller_filename)"
}

function test_globals_caller_line() {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,7 +71,7 @@ function test_unsuccessful_spy_called_times() {

function test_successful_spy_with_source_function() {
# shellcheck source=/dev/null
source "$(bashunit::current_dir)/fixtures/fake_function_to_spy.sh"
source "$(bashunit::current_dir)/../fixtures/fake_function_to_spy.sh"
bashunit::spy function_to_be_spied_on

function_to_be_spied_on
Expand All@@ -81,7 +81,7 @@ function test_successful_spy_with_source_function() {

function test_unsuccessful_spy_with_source_function_have_been_called() {
# shellcheck source=/dev/null
source "$(bashunit::current_dir)/fixtures/fake_function_to_spy.sh"
source "$(bashunit::current_dir)/../fixtures/fake_function_to_spy.sh"
bashunit::spy function_to_be_spied_on

function_to_be_spied_on
Expand All@@ -99,7 +99,7 @@ function test_unsuccessful_spy_with_source_function_have_been_called() {

function test_successful_spy_called_times_with_source() {
# shellcheck source=/dev/null
source "$(bashunit::current_dir)/fixtures/fake_function_to_spy.sh"
source "$(bashunit::current_dir)/../fixtures/fake_function_to_spy.sh"
bashunit::spy function_to_be_spied_on

function_to_be_spied_on
Expand Down
40 changes: 20 additions & 20 deletions tests/unit/helpers_test.sh → tests/unit/helper/helper_test.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -125,28 +125,28 @@ function test_successful_unset_if_exists() {

function test_check_duplicate_functions_with_duplicates() {
local file
file="$(bashunit::current_dir)/fixtures/duplicate_functions.sh"
file="$(bashunit::current_dir)/../fixtures/duplicate_functions.sh"

assert_general_error "$(bashunit::helper::check_duplicate_functions "$file")"
}

function test_check_duplicate_functions_without_duplicates() {
local file
file="$(bashunit::current_dir)/fixtures/no_duplicate_functions.sh"
file="$(bashunit::current_dir)/../fixtures/no_duplicate_functions.sh"

assert_successful_code "$(bashunit::helper::check_duplicate_functions "$file")"
}

function test_check_duplicate_functions_without_function_keyword() {
local file
file="$(bashunit::current_dir)/fixtures/no_function_keyword_duplicates.sh"
file="$(bashunit::current_dir)/../fixtures/no_function_keyword_duplicates.sh"

assert_general_error "$(bashunit::helper::check_duplicate_functions "$file")"
}

function test_check_duplicate_functions_reports_each_duplicate_name_sorted() {
local file names
file="$(bashunit::current_dir)/fixtures/multiple_duplicate_functions.sh"
file="$(bashunit::current_dir)/../fixtures/multiple_duplicate_functions.sh"

# Isolate the state mutation in a subshell; report the stored duplicate names.
names=$(
Expand DownExpand Up@@ -255,7 +255,7 @@ function test_get_provider_data_should_returns_empty_when_not_exists_provider_fu
"$(bashunit::helper::get_provider_data "fake_function_get_not_existing_provider_data" "${BASH_SOURCE[0]}")"
}

FIXTURE_PROVIDER_MAP="$(dirname "${BASH_SOURCE[0]}")/fixtures/provider_map/sample_providers.sh"
FIXTURE_PROVIDER_MAP="$(dirname "${BASH_SOURCE[0]}")/../fixtures/provider_map/sample_providers.sh"

function provider_for() {
bashunit::helper::build_provider_map "$1"
Expand DownExpand Up@@ -324,7 +324,7 @@ function test_build_provider_map_no_parallel_marker_defaults_false() {

function test_find_files_recursive_given_file() {
local path
path="$(bashunit::current_dir)/fixtures/tests/example1_test.sh"
path="tests/unit/fixtures/tests/example1_test.sh"

local result
result=$(bashunit::helper::find_files_recursive "$path")
Expand All@@ -334,7 +334,7 @@ function test_find_files_recursive_given_file() {

function test_find_files_recursive_given_dir() {
local path
path="$(bashunit::current_dir)/fixtures/tests"
path="tests/unit/fixtures/tests"

local result
result=$(bashunit::helper::find_files_recursive "$path")
Expand All@@ -347,7 +347,7 @@ tests/unit/fixtures/tests/example3_test.bash" \

function test_find_files_recursive_given_wildcard() {
local path
path="$(bashunit::current_dir)/fixtures/tests/*2_test.sh"
path="tests/unit/fixtures/tests/*2_test.sh"

local result
result=$(bashunit::helper::find_files_recursive "$path")
Expand All@@ -357,7 +357,7 @@ function test_find_files_recursive_given_wildcard() {

function test_find_files_recursive_given_bash_extension() {
local path
path="$(bashunit::current_dir)/fixtures/tests/*3_test.bash"
path="tests/unit/fixtures/tests/*3_test.bash"

local result
result=$(bashunit::helper::find_files_recursive "$path")
Expand DownExpand Up@@ -465,39 +465,39 @@ function test_find_total_tests_no_files() {

function test_find_total_tests_simple_file() {
local file
file="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.sh"
file="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.sh"

assert_same "2" "$(helpers_test::find_total_in_subshell "" "$file")"
}

function test_find_total_tests_simple_file_bash() {
local file
file="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.bash"
file="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.bash"

assert_same "2" "$(helpers_test::find_total_in_subshell "" "$file")"
}

function test_find_total_tests_with_provider() {
local file
file="$(bashunit::current_dir)/fixtures/find_total_tests/provider_fixture.sh"
file="$(bashunit::current_dir)/../fixtures/find_total_tests/provider_fixture.sh"

assert_same "3" "$(helpers_test::find_total_in_subshell "" "$file")"
}

function test_find_total_tests_multiple_files() {
local file1
local file2
file1="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.sh"
file2="$(bashunit::current_dir)/fixtures/find_total_tests/provider_fixture.sh"
file1="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.sh"
file2="$(bashunit::current_dir)/../fixtures/find_total_tests/provider_fixture.sh"

assert_same "5" "$(helpers_test::find_total_in_subshell "" "$file1" "$file2")"
}

function test_find_total_tests_with_filter() {
local file1
local file2
file1="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.sh"
file2="$(bashunit::current_dir)/fixtures/find_total_tests/provider_fixture.sh"
file1="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.sh"
file2="$(bashunit::current_dir)/../fixtures/find_total_tests/provider_fixture.sh"

assert_same "3" "$(helpers_test::find_total_in_subshell "with_provider" "$file1" "$file2")"
}
Expand DownExpand Up@@ -574,28 +574,28 @@ function test_parse_file_path_filter_with_colon_in_path() {

function test_find_function_at_line_first_function() {
local file
file="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.sh"
file="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.sh"

assert_same "test_first" "$(bashunit::helper::find_function_at_line "$file" 4)"
}

function test_find_function_at_line_second_function() {
local file
file="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.sh"
file="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.sh"

assert_same "test_second" "$(bashunit::helper::find_function_at_line "$file" 8)"
}

function test_find_function_at_line_exact_function_line() {
local file
file="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.sh"
file="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.sh"

assert_same "test_first" "$(bashunit::helper::find_function_at_line "$file" 3)"
}

function test_find_function_at_line_before_any_function() {
local file
file="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.sh"
file="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.sh"

assert_same "" "$(bashunit::helper::find_function_at_line "$file" 1)"
}
Expand Down
File renamed without changes.
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
#!/usr/bin/env bash
# shellcheck disable=SC2317

FIXTURE_TAGS_MAP="$(dirname "${BASH_SOURCE[0]}")/fixtures/tags_map/sample_tags.sh"
FIXTURE_TAGS_MAP_OTHER="$(dirname "${BASH_SOURCE[0]}")/fixtures/tags_map/sample_tags_other.sh"
FIXTURE_TAGS_MAP="$(dirname "${BASH_SOURCE[0]}")/../fixtures/tags_map/sample_tags.sh"
FIXTURE_TAGS_MAP_OTHER="$(dirname "${BASH_SOURCE[0]}")/../fixtures/tags_map/sample_tags_other.sh"

function tags_for() {
bashunit::helper::build_tags_map "$1"
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ function _learn_in_sandbox() {
sandbox="$(bashunit::temp_dir)"
# Resolve the repo root from this test file, not $BASHUNIT_ROOT_DIR: under
# `build.sh --verify` the running binary's root dir has no src/ (#834).
root_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
root_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"
# stdin is /dev/null so the `read -p "Press Enter to continue..."` prompts in
# the interactive paths hit EOF and return instead of blocking the suite.
# BASHUNIT_ROOT_DIR is set INSIDE the child (run_lesson_test shells out to the
Expand Down
File renamed without changes.
File renamed without changes.
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
ROOT_DIR=""

function set_up_before_script() {
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"
}

function src_files_sourced_by_entrypoint() {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ PKG_FILE=""
DOCS_PKG_FILE=""

function set_up_before_script() {
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"
PKG_FILE="$ROOT_DIR/package.json"
DOCS_PKG_FILE="$ROOT_DIR/docs/package.json"
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@ RELEASE_SCRIPT_DIR=""
FIXTURES_DIR=""

function set_up_before_script() {
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
FIXTURES_DIR="$(dirname "${BASH_SOURCE[0]}")/fixtures/release"
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"
FIXTURES_DIR="$(dirname "${BASH_SOURCE[0]}")/../fixtures/release"

# Source release.sh to get access to functions
# shellcheck source=/dev/null
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ RELEASE_SCRIPT_DIR=""
FIXTURE_DIR=""

function set_up_before_script() {
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"

# Source release.sh to get access to functions
# shellcheck source=/dev/null
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@ RELEASE_SCRIPT_DIR=""
FIXTURES_DIR=""

function set_up_before_script() {
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
FIXTURES_DIR="$(dirname "${BASH_SOURCE[0]}")/fixtures/release"
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"
FIXTURES_DIR="$(dirname "${BASH_SOURCE[0]}")/../fixtures/release"

# Source release.sh to get access to functions
# shellcheck source=/dev/null
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@ RELEASE_SCRIPT_DIR=""
FIXTURES_DIR=""

function set_up_before_script() {
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
FIXTURES_DIR="$(dirname "${BASH_SOURCE[0]}")/fixtures/release"
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"
FIXTURES_DIR="$(dirname "${BASH_SOURCE[0]}")/../fixtures/release"

# Source release.sh to get access to functions
# shellcheck source=/dev/null
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ fi
RELEASE_SCRIPT_DIR=""

function set_up_before_script() {
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"

# Source release.sh to get access to functions
# shellcheck source=/dev/null
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line numberDiff line numberDiff line change
Expand Up@@ -85,7 +85,7 @@ function test_module_load_detects_os_with_a_single_uname_call() {
# under `build.sh --verify` the built bashunit lives in a folder
# without src/, and sourcing through $BASHUNIT_ROOT_DIR crashed
# the whole verification run (silently, until #834 gated it).
source "$(dirname "${BASH_SOURCE[0]}")/../../src/system/check_os.sh"
source "$(dirname "${BASH_SOURCE[0]}")/../../../src/system/check_os.sh"

assert_have_been_called_times 1 uname
}
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' refactor(tests): mirror the src/ module layout in tests/unit/ by Chemaclass · Pull Request #960 · TypedDevs/bashunit · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ function tear_down() {
}

function test_globals_current_dir() {
assert_same "tests/unit" "$(bashunit::current_dir)"
assert_same "tests/unit/api" "$(bashunit::current_dir)"
}

function test_globals_current_filename() {
Expand All@@ -38,7 +38,7 @@ function globals_test::call_caller_filename() {
}

function test_globals_caller_filename() {
assert_same "tests/unit" "$(globals_test::call_caller_filename)"
assert_same "tests/unit/api" "$(globals_test::call_caller_filename)"
}

function test_globals_caller_line() {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,7 +71,7 @@ function test_unsuccessful_spy_called_times() {

function test_successful_spy_with_source_function() {
# shellcheck source=/dev/null
source "$(bashunit::current_dir)/fixtures/fake_function_to_spy.sh"
source "$(bashunit::current_dir)/../fixtures/fake_function_to_spy.sh"
bashunit::spy function_to_be_spied_on

function_to_be_spied_on
Expand All@@ -81,7 +81,7 @@ function test_successful_spy_with_source_function() {

function test_unsuccessful_spy_with_source_function_have_been_called() {
# shellcheck source=/dev/null
source "$(bashunit::current_dir)/fixtures/fake_function_to_spy.sh"
source "$(bashunit::current_dir)/../fixtures/fake_function_to_spy.sh"
bashunit::spy function_to_be_spied_on

function_to_be_spied_on
Expand All@@ -99,7 +99,7 @@ function test_unsuccessful_spy_with_source_function_have_been_called() {

function test_successful_spy_called_times_with_source() {
# shellcheck source=/dev/null
source "$(bashunit::current_dir)/fixtures/fake_function_to_spy.sh"
source "$(bashunit::current_dir)/../fixtures/fake_function_to_spy.sh"
bashunit::spy function_to_be_spied_on

function_to_be_spied_on
Expand Down
40 changes: 20 additions & 20 deletions tests/unit/helpers_test.sh → tests/unit/helper/helper_test.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -125,28 +125,28 @@ function test_successful_unset_if_exists() {

function test_check_duplicate_functions_with_duplicates() {
local file
file="$(bashunit::current_dir)/fixtures/duplicate_functions.sh"
file="$(bashunit::current_dir)/../fixtures/duplicate_functions.sh"

assert_general_error "$(bashunit::helper::check_duplicate_functions "$file")"
}

function test_check_duplicate_functions_without_duplicates() {
local file
file="$(bashunit::current_dir)/fixtures/no_duplicate_functions.sh"
file="$(bashunit::current_dir)/../fixtures/no_duplicate_functions.sh"

assert_successful_code "$(bashunit::helper::check_duplicate_functions "$file")"
}

function test_check_duplicate_functions_without_function_keyword() {
local file
file="$(bashunit::current_dir)/fixtures/no_function_keyword_duplicates.sh"
file="$(bashunit::current_dir)/../fixtures/no_function_keyword_duplicates.sh"

assert_general_error "$(bashunit::helper::check_duplicate_functions "$file")"
}

function test_check_duplicate_functions_reports_each_duplicate_name_sorted() {
local file names
file="$(bashunit::current_dir)/fixtures/multiple_duplicate_functions.sh"
file="$(bashunit::current_dir)/../fixtures/multiple_duplicate_functions.sh"

# Isolate the state mutation in a subshell; report the stored duplicate names.
names=$(
Expand DownExpand Up@@ -255,7 +255,7 @@ function test_get_provider_data_should_returns_empty_when_not_exists_provider_fu
"$(bashunit::helper::get_provider_data "fake_function_get_not_existing_provider_data" "${BASH_SOURCE[0]}")"
}

FIXTURE_PROVIDER_MAP="$(dirname "${BASH_SOURCE[0]}")/fixtures/provider_map/sample_providers.sh"
FIXTURE_PROVIDER_MAP="$(dirname "${BASH_SOURCE[0]}")/../fixtures/provider_map/sample_providers.sh"

function provider_for() {
bashunit::helper::build_provider_map "$1"
Expand DownExpand Up@@ -324,7 +324,7 @@ function test_build_provider_map_no_parallel_marker_defaults_false() {

function test_find_files_recursive_given_file() {
local path
path="$(bashunit::current_dir)/fixtures/tests/example1_test.sh"
path="tests/unit/fixtures/tests/example1_test.sh"

local result
result=$(bashunit::helper::find_files_recursive "$path")
Expand All@@ -334,7 +334,7 @@ function test_find_files_recursive_given_file() {

function test_find_files_recursive_given_dir() {
local path
path="$(bashunit::current_dir)/fixtures/tests"
path="tests/unit/fixtures/tests"

local result
result=$(bashunit::helper::find_files_recursive "$path")
Expand All@@ -347,7 +347,7 @@ tests/unit/fixtures/tests/example3_test.bash" \

function test_find_files_recursive_given_wildcard() {
local path
path="$(bashunit::current_dir)/fixtures/tests/*2_test.sh"
path="tests/unit/fixtures/tests/*2_test.sh"

local result
result=$(bashunit::helper::find_files_recursive "$path")
Expand All@@ -357,7 +357,7 @@ function test_find_files_recursive_given_wildcard() {

function test_find_files_recursive_given_bash_extension() {
local path
path="$(bashunit::current_dir)/fixtures/tests/*3_test.bash"
path="tests/unit/fixtures/tests/*3_test.bash"

local result
result=$(bashunit::helper::find_files_recursive "$path")
Expand DownExpand Up@@ -465,39 +465,39 @@ function test_find_total_tests_no_files() {

function test_find_total_tests_simple_file() {
local file
file="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.sh"
file="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.sh"

assert_same "2" "$(helpers_test::find_total_in_subshell "" "$file")"
}

function test_find_total_tests_simple_file_bash() {
local file
file="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.bash"
file="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.bash"

assert_same "2" "$(helpers_test::find_total_in_subshell "" "$file")"
}

function test_find_total_tests_with_provider() {
local file
file="$(bashunit::current_dir)/fixtures/find_total_tests/provider_fixture.sh"
file="$(bashunit::current_dir)/../fixtures/find_total_tests/provider_fixture.sh"

assert_same "3" "$(helpers_test::find_total_in_subshell "" "$file")"
}

function test_find_total_tests_multiple_files() {
local file1
local file2
file1="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.sh"
file2="$(bashunit::current_dir)/fixtures/find_total_tests/provider_fixture.sh"
file1="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.sh"
file2="$(bashunit::current_dir)/../fixtures/find_total_tests/provider_fixture.sh"

assert_same "5" "$(helpers_test::find_total_in_subshell "" "$file1" "$file2")"
}

function test_find_total_tests_with_filter() {
local file1
local file2
file1="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.sh"
file2="$(bashunit::current_dir)/fixtures/find_total_tests/provider_fixture.sh"
file1="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.sh"
file2="$(bashunit::current_dir)/../fixtures/find_total_tests/provider_fixture.sh"

assert_same "3" "$(helpers_test::find_total_in_subshell "with_provider" "$file1" "$file2")"
}
Expand DownExpand Up@@ -574,28 +574,28 @@ function test_parse_file_path_filter_with_colon_in_path() {

function test_find_function_at_line_first_function() {
local file
file="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.sh"
file="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.sh"

assert_same "test_first" "$(bashunit::helper::find_function_at_line "$file" 4)"
}

function test_find_function_at_line_second_function() {
local file
file="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.sh"
file="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.sh"

assert_same "test_second" "$(bashunit::helper::find_function_at_line "$file" 8)"
}

function test_find_function_at_line_exact_function_line() {
local file
file="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.sh"
file="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.sh"

assert_same "test_first" "$(bashunit::helper::find_function_at_line "$file" 3)"
}

function test_find_function_at_line_before_any_function() {
local file
file="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.sh"
file="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.sh"

assert_same "" "$(bashunit::helper::find_function_at_line "$file" 1)"
}
Expand Down
File renamed without changes.
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
#!/usr/bin/env bash
# shellcheck disable=SC2317

FIXTURE_TAGS_MAP="$(dirname "${BASH_SOURCE[0]}")/fixtures/tags_map/sample_tags.sh"
FIXTURE_TAGS_MAP_OTHER="$(dirname "${BASH_SOURCE[0]}")/fixtures/tags_map/sample_tags_other.sh"
FIXTURE_TAGS_MAP="$(dirname "${BASH_SOURCE[0]}")/../fixtures/tags_map/sample_tags.sh"
FIXTURE_TAGS_MAP_OTHER="$(dirname "${BASH_SOURCE[0]}")/../fixtures/tags_map/sample_tags_other.sh"

function tags_for() {
bashunit::helper::build_tags_map "$1"
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ function _learn_in_sandbox() {
sandbox="$(bashunit::temp_dir)"
# Resolve the repo root from this test file, not $BASHUNIT_ROOT_DIR: under
# `build.sh --verify` the running binary's root dir has no src/ (#834).
root_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
root_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"
# stdin is /dev/null so the `read -p "Press Enter to continue..."` prompts in
# the interactive paths hit EOF and return instead of blocking the suite.
# BASHUNIT_ROOT_DIR is set INSIDE the child (run_lesson_test shells out to the
Expand Down
File renamed without changes.
File renamed without changes.
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
ROOT_DIR=""

function set_up_before_script() {
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"
}

function src_files_sourced_by_entrypoint() {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ PKG_FILE=""
DOCS_PKG_FILE=""

function set_up_before_script() {
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"
PKG_FILE="$ROOT_DIR/package.json"
DOCS_PKG_FILE="$ROOT_DIR/docs/package.json"
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@ RELEASE_SCRIPT_DIR=""
FIXTURES_DIR=""

function set_up_before_script() {
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
FIXTURES_DIR="$(dirname "${BASH_SOURCE[0]}")/fixtures/release"
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"
FIXTURES_DIR="$(dirname "${BASH_SOURCE[0]}")/../fixtures/release"

# Source release.sh to get access to functions
# shellcheck source=/dev/null
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ RELEASE_SCRIPT_DIR=""
FIXTURE_DIR=""

function set_up_before_script() {
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"

# Source release.sh to get access to functions
# shellcheck source=/dev/null
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@ RELEASE_SCRIPT_DIR=""
FIXTURES_DIR=""

function set_up_before_script() {
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
FIXTURES_DIR="$(dirname "${BASH_SOURCE[0]}")/fixtures/release"
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"
FIXTURES_DIR="$(dirname "${BASH_SOURCE[0]}")/../fixtures/release"

# Source release.sh to get access to functions
# shellcheck source=/dev/null
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@ RELEASE_SCRIPT_DIR=""
FIXTURES_DIR=""

function set_up_before_script() {
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
FIXTURES_DIR="$(dirname "${BASH_SOURCE[0]}")/fixtures/release"
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"
FIXTURES_DIR="$(dirname "${BASH_SOURCE[0]}")/../fixtures/release"

# Source release.sh to get access to functions
# shellcheck source=/dev/null
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ fi
RELEASE_SCRIPT_DIR=""

function set_up_before_script() {
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"

# Source release.sh to get access to functions
# shellcheck source=/dev/null
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line numberDiff line numberDiff line change
Expand Up@@ -85,7 +85,7 @@ function test_module_load_detects_os_with_a_single_uname_call() {
# under `build.sh --verify` the built bashunit lives in a folder
# without src/, and sourcing through $BASHUNIT_ROOT_DIR crashed
# the whole verification run (silently, until #834 gated it).
source "$(dirname "${BASH_SOURCE[0]}")/../../src/system/check_os.sh"
source "$(dirname "${BASH_SOURCE[0]}")/../../../src/system/check_os.sh"

assert_have_been_called_times 1 uname
}
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' refactor(tests): mirror the src/ module layout in tests/unit/ by Chemaclass · Pull Request #960 · TypedDevs/bashunit · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ function tear_down() {
}

function test_globals_current_dir() {
assert_same "tests/unit" "$(bashunit::current_dir)"
assert_same "tests/unit/api" "$(bashunit::current_dir)"
}

function test_globals_current_filename() {
Expand All@@ -38,7 +38,7 @@ function globals_test::call_caller_filename() {
}

function test_globals_caller_filename() {
assert_same "tests/unit" "$(globals_test::call_caller_filename)"
assert_same "tests/unit/api" "$(globals_test::call_caller_filename)"
}

function test_globals_caller_line() {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,7 +71,7 @@ function test_unsuccessful_spy_called_times() {

function test_successful_spy_with_source_function() {
# shellcheck source=/dev/null
source "$(bashunit::current_dir)/fixtures/fake_function_to_spy.sh"
source "$(bashunit::current_dir)/../fixtures/fake_function_to_spy.sh"
bashunit::spy function_to_be_spied_on

function_to_be_spied_on
Expand All@@ -81,7 +81,7 @@ function test_successful_spy_with_source_function() {

function test_unsuccessful_spy_with_source_function_have_been_called() {
# shellcheck source=/dev/null
source "$(bashunit::current_dir)/fixtures/fake_function_to_spy.sh"
source "$(bashunit::current_dir)/../fixtures/fake_function_to_spy.sh"
bashunit::spy function_to_be_spied_on

function_to_be_spied_on
Expand All@@ -99,7 +99,7 @@ function test_unsuccessful_spy_with_source_function_have_been_called() {

function test_successful_spy_called_times_with_source() {
# shellcheck source=/dev/null
source "$(bashunit::current_dir)/fixtures/fake_function_to_spy.sh"
source "$(bashunit::current_dir)/../fixtures/fake_function_to_spy.sh"
bashunit::spy function_to_be_spied_on

function_to_be_spied_on
Expand Down
40 changes: 20 additions & 20 deletions tests/unit/helpers_test.sh → tests/unit/helper/helper_test.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -125,28 +125,28 @@ function test_successful_unset_if_exists() {

function test_check_duplicate_functions_with_duplicates() {
local file
file="$(bashunit::current_dir)/fixtures/duplicate_functions.sh"
file="$(bashunit::current_dir)/../fixtures/duplicate_functions.sh"

assert_general_error "$(bashunit::helper::check_duplicate_functions "$file")"
}

function test_check_duplicate_functions_without_duplicates() {
local file
file="$(bashunit::current_dir)/fixtures/no_duplicate_functions.sh"
file="$(bashunit::current_dir)/../fixtures/no_duplicate_functions.sh"

assert_successful_code "$(bashunit::helper::check_duplicate_functions "$file")"
}

function test_check_duplicate_functions_without_function_keyword() {
local file
file="$(bashunit::current_dir)/fixtures/no_function_keyword_duplicates.sh"
file="$(bashunit::current_dir)/../fixtures/no_function_keyword_duplicates.sh"

assert_general_error "$(bashunit::helper::check_duplicate_functions "$file")"
}

function test_check_duplicate_functions_reports_each_duplicate_name_sorted() {
local file names
file="$(bashunit::current_dir)/fixtures/multiple_duplicate_functions.sh"
file="$(bashunit::current_dir)/../fixtures/multiple_duplicate_functions.sh"

# Isolate the state mutation in a subshell; report the stored duplicate names.
names=$(
Expand DownExpand Up@@ -255,7 +255,7 @@ function test_get_provider_data_should_returns_empty_when_not_exists_provider_fu
"$(bashunit::helper::get_provider_data "fake_function_get_not_existing_provider_data" "${BASH_SOURCE[0]}")"
}

FIXTURE_PROVIDER_MAP="$(dirname "${BASH_SOURCE[0]}")/fixtures/provider_map/sample_providers.sh"
FIXTURE_PROVIDER_MAP="$(dirname "${BASH_SOURCE[0]}")/../fixtures/provider_map/sample_providers.sh"

function provider_for() {
bashunit::helper::build_provider_map "$1"
Expand DownExpand Up@@ -324,7 +324,7 @@ function test_build_provider_map_no_parallel_marker_defaults_false() {

function test_find_files_recursive_given_file() {
local path
path="$(bashunit::current_dir)/fixtures/tests/example1_test.sh"
path="tests/unit/fixtures/tests/example1_test.sh"

local result
result=$(bashunit::helper::find_files_recursive "$path")
Expand All@@ -334,7 +334,7 @@ function test_find_files_recursive_given_file() {

function test_find_files_recursive_given_dir() {
local path
path="$(bashunit::current_dir)/fixtures/tests"
path="tests/unit/fixtures/tests"

local result
result=$(bashunit::helper::find_files_recursive "$path")
Expand All@@ -347,7 +347,7 @@ tests/unit/fixtures/tests/example3_test.bash" \

function test_find_files_recursive_given_wildcard() {
local path
path="$(bashunit::current_dir)/fixtures/tests/*2_test.sh"
path="tests/unit/fixtures/tests/*2_test.sh"

local result
result=$(bashunit::helper::find_files_recursive "$path")
Expand All@@ -357,7 +357,7 @@ function test_find_files_recursive_given_wildcard() {

function test_find_files_recursive_given_bash_extension() {
local path
path="$(bashunit::current_dir)/fixtures/tests/*3_test.bash"
path="tests/unit/fixtures/tests/*3_test.bash"

local result
result=$(bashunit::helper::find_files_recursive "$path")
Expand DownExpand Up@@ -465,39 +465,39 @@ function test_find_total_tests_no_files() {

function test_find_total_tests_simple_file() {
local file
file="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.sh"
file="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.sh"

assert_same "2" "$(helpers_test::find_total_in_subshell "" "$file")"
}

function test_find_total_tests_simple_file_bash() {
local file
file="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.bash"
file="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.bash"

assert_same "2" "$(helpers_test::find_total_in_subshell "" "$file")"
}

function test_find_total_tests_with_provider() {
local file
file="$(bashunit::current_dir)/fixtures/find_total_tests/provider_fixture.sh"
file="$(bashunit::current_dir)/../fixtures/find_total_tests/provider_fixture.sh"

assert_same "3" "$(helpers_test::find_total_in_subshell "" "$file")"
}

function test_find_total_tests_multiple_files() {
local file1
local file2
file1="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.sh"
file2="$(bashunit::current_dir)/fixtures/find_total_tests/provider_fixture.sh"
file1="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.sh"
file2="$(bashunit::current_dir)/../fixtures/find_total_tests/provider_fixture.sh"

assert_same "5" "$(helpers_test::find_total_in_subshell "" "$file1" "$file2")"
}

function test_find_total_tests_with_filter() {
local file1
local file2
file1="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.sh"
file2="$(bashunit::current_dir)/fixtures/find_total_tests/provider_fixture.sh"
file1="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.sh"
file2="$(bashunit::current_dir)/../fixtures/find_total_tests/provider_fixture.sh"

assert_same "3" "$(helpers_test::find_total_in_subshell "with_provider" "$file1" "$file2")"
}
Expand DownExpand Up@@ -574,28 +574,28 @@ function test_parse_file_path_filter_with_colon_in_path() {

function test_find_function_at_line_first_function() {
local file
file="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.sh"
file="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.sh"

assert_same "test_first" "$(bashunit::helper::find_function_at_line "$file" 4)"
}

function test_find_function_at_line_second_function() {
local file
file="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.sh"
file="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.sh"

assert_same "test_second" "$(bashunit::helper::find_function_at_line "$file" 8)"
}

function test_find_function_at_line_exact_function_line() {
local file
file="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.sh"
file="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.sh"

assert_same "test_first" "$(bashunit::helper::find_function_at_line "$file" 3)"
}

function test_find_function_at_line_before_any_function() {
local file
file="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.sh"
file="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.sh"

assert_same "" "$(bashunit::helper::find_function_at_line "$file" 1)"
}
Expand Down
File renamed without changes.
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
#!/usr/bin/env bash
# shellcheck disable=SC2317

FIXTURE_TAGS_MAP="$(dirname "${BASH_SOURCE[0]}")/fixtures/tags_map/sample_tags.sh"
FIXTURE_TAGS_MAP_OTHER="$(dirname "${BASH_SOURCE[0]}")/fixtures/tags_map/sample_tags_other.sh"
FIXTURE_TAGS_MAP="$(dirname "${BASH_SOURCE[0]}")/../fixtures/tags_map/sample_tags.sh"
FIXTURE_TAGS_MAP_OTHER="$(dirname "${BASH_SOURCE[0]}")/../fixtures/tags_map/sample_tags_other.sh"

function tags_for() {
bashunit::helper::build_tags_map "$1"
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ function _learn_in_sandbox() {
sandbox="$(bashunit::temp_dir)"
# Resolve the repo root from this test file, not $BASHUNIT_ROOT_DIR: under
# `build.sh --verify` the running binary's root dir has no src/ (#834).
root_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
root_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"
# stdin is /dev/null so the `read -p "Press Enter to continue..."` prompts in
# the interactive paths hit EOF and return instead of blocking the suite.
# BASHUNIT_ROOT_DIR is set INSIDE the child (run_lesson_test shells out to the
Expand Down
File renamed without changes.
File renamed without changes.
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
ROOT_DIR=""

function set_up_before_script() {
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"
}

function src_files_sourced_by_entrypoint() {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ PKG_FILE=""
DOCS_PKG_FILE=""

function set_up_before_script() {
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"
PKG_FILE="$ROOT_DIR/package.json"
DOCS_PKG_FILE="$ROOT_DIR/docs/package.json"
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@ RELEASE_SCRIPT_DIR=""
FIXTURES_DIR=""

function set_up_before_script() {
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
FIXTURES_DIR="$(dirname "${BASH_SOURCE[0]}")/fixtures/release"
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"
FIXTURES_DIR="$(dirname "${BASH_SOURCE[0]}")/../fixtures/release"

# Source release.sh to get access to functions
# shellcheck source=/dev/null
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ RELEASE_SCRIPT_DIR=""
FIXTURE_DIR=""

function set_up_before_script() {
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"

# Source release.sh to get access to functions
# shellcheck source=/dev/null
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@ RELEASE_SCRIPT_DIR=""
FIXTURES_DIR=""

function set_up_before_script() {
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
FIXTURES_DIR="$(dirname "${BASH_SOURCE[0]}")/fixtures/release"
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"
FIXTURES_DIR="$(dirname "${BASH_SOURCE[0]}")/../fixtures/release"

# Source release.sh to get access to functions
# shellcheck source=/dev/null
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@ RELEASE_SCRIPT_DIR=""
FIXTURES_DIR=""

function set_up_before_script() {
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
FIXTURES_DIR="$(dirname "${BASH_SOURCE[0]}")/fixtures/release"
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"
FIXTURES_DIR="$(dirname "${BASH_SOURCE[0]}")/../fixtures/release"

# Source release.sh to get access to functions
# shellcheck source=/dev/null
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ fi
RELEASE_SCRIPT_DIR=""

function set_up_before_script() {
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"

# Source release.sh to get access to functions
# shellcheck source=/dev/null
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line numberDiff line numberDiff line change
Expand Up@@ -85,7 +85,7 @@ function test_module_load_detects_os_with_a_single_uname_call() {
# under `build.sh --verify` the built bashunit lives in a folder
# without src/, and sourcing through $BASHUNIT_ROOT_DIR crashed
# the whole verification run (silently, until #834 gated it).
source "$(dirname "${BASH_SOURCE[0]}")/../../src/system/check_os.sh"
source "$(dirname "${BASH_SOURCE[0]}")/../../../src/system/check_os.sh"

assert_have_been_called_times 1 uname
}
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); refactor(tests): mirror the src/ module layout in tests/unit/ by Chemaclass · Pull Request #960 · TypedDevs/bashunit · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ function tear_down() {
}

function test_globals_current_dir() {
assert_same "tests/unit" "$(bashunit::current_dir)"
assert_same "tests/unit/api" "$(bashunit::current_dir)"
}

function test_globals_current_filename() {
Expand All@@ -38,7 +38,7 @@ function globals_test::call_caller_filename() {
}

function test_globals_caller_filename() {
assert_same "tests/unit" "$(globals_test::call_caller_filename)"
assert_same "tests/unit/api" "$(globals_test::call_caller_filename)"
}

function test_globals_caller_line() {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,7 +71,7 @@ function test_unsuccessful_spy_called_times() {

function test_successful_spy_with_source_function() {
# shellcheck source=/dev/null
source "$(bashunit::current_dir)/fixtures/fake_function_to_spy.sh"
source "$(bashunit::current_dir)/../fixtures/fake_function_to_spy.sh"
bashunit::spy function_to_be_spied_on

function_to_be_spied_on
Expand All@@ -81,7 +81,7 @@ function test_successful_spy_with_source_function() {

function test_unsuccessful_spy_with_source_function_have_been_called() {
# shellcheck source=/dev/null
source "$(bashunit::current_dir)/fixtures/fake_function_to_spy.sh"
source "$(bashunit::current_dir)/../fixtures/fake_function_to_spy.sh"
bashunit::spy function_to_be_spied_on

function_to_be_spied_on
Expand All@@ -99,7 +99,7 @@ function test_unsuccessful_spy_with_source_function_have_been_called() {

function test_successful_spy_called_times_with_source() {
# shellcheck source=/dev/null
source "$(bashunit::current_dir)/fixtures/fake_function_to_spy.sh"
source "$(bashunit::current_dir)/../fixtures/fake_function_to_spy.sh"
bashunit::spy function_to_be_spied_on

function_to_be_spied_on
Expand Down
40 changes: 20 additions & 20 deletions tests/unit/helpers_test.sh → tests/unit/helper/helper_test.sh
Original file line numberDiff line numberDiff line change
Expand Up@@ -125,28 +125,28 @@ function test_successful_unset_if_exists() {

function test_check_duplicate_functions_with_duplicates() {
local file
file="$(bashunit::current_dir)/fixtures/duplicate_functions.sh"
file="$(bashunit::current_dir)/../fixtures/duplicate_functions.sh"

assert_general_error "$(bashunit::helper::check_duplicate_functions "$file")"
}

function test_check_duplicate_functions_without_duplicates() {
local file
file="$(bashunit::current_dir)/fixtures/no_duplicate_functions.sh"
file="$(bashunit::current_dir)/../fixtures/no_duplicate_functions.sh"

assert_successful_code "$(bashunit::helper::check_duplicate_functions "$file")"
}

function test_check_duplicate_functions_without_function_keyword() {
local file
file="$(bashunit::current_dir)/fixtures/no_function_keyword_duplicates.sh"
file="$(bashunit::current_dir)/../fixtures/no_function_keyword_duplicates.sh"

assert_general_error "$(bashunit::helper::check_duplicate_functions "$file")"
}

function test_check_duplicate_functions_reports_each_duplicate_name_sorted() {
local file names
file="$(bashunit::current_dir)/fixtures/multiple_duplicate_functions.sh"
file="$(bashunit::current_dir)/../fixtures/multiple_duplicate_functions.sh"

# Isolate the state mutation in a subshell; report the stored duplicate names.
names=$(
Expand DownExpand Up@@ -255,7 +255,7 @@ function test_get_provider_data_should_returns_empty_when_not_exists_provider_fu
"$(bashunit::helper::get_provider_data "fake_function_get_not_existing_provider_data" "${BASH_SOURCE[0]}")"
}

FIXTURE_PROVIDER_MAP="$(dirname "${BASH_SOURCE[0]}")/fixtures/provider_map/sample_providers.sh"
FIXTURE_PROVIDER_MAP="$(dirname "${BASH_SOURCE[0]}")/../fixtures/provider_map/sample_providers.sh"

function provider_for() {
bashunit::helper::build_provider_map "$1"
Expand DownExpand Up@@ -324,7 +324,7 @@ function test_build_provider_map_no_parallel_marker_defaults_false() {

function test_find_files_recursive_given_file() {
local path
path="$(bashunit::current_dir)/fixtures/tests/example1_test.sh"
path="tests/unit/fixtures/tests/example1_test.sh"

local result
result=$(bashunit::helper::find_files_recursive "$path")
Expand All@@ -334,7 +334,7 @@ function test_find_files_recursive_given_file() {

function test_find_files_recursive_given_dir() {
local path
path="$(bashunit::current_dir)/fixtures/tests"
path="tests/unit/fixtures/tests"

local result
result=$(bashunit::helper::find_files_recursive "$path")
Expand All@@ -347,7 +347,7 @@ tests/unit/fixtures/tests/example3_test.bash" \

function test_find_files_recursive_given_wildcard() {
local path
path="$(bashunit::current_dir)/fixtures/tests/*2_test.sh"
path="tests/unit/fixtures/tests/*2_test.sh"

local result
result=$(bashunit::helper::find_files_recursive "$path")
Expand All@@ -357,7 +357,7 @@ function test_find_files_recursive_given_wildcard() {

function test_find_files_recursive_given_bash_extension() {
local path
path="$(bashunit::current_dir)/fixtures/tests/*3_test.bash"
path="tests/unit/fixtures/tests/*3_test.bash"

local result
result=$(bashunit::helper::find_files_recursive "$path")
Expand DownExpand Up@@ -465,39 +465,39 @@ function test_find_total_tests_no_files() {

function test_find_total_tests_simple_file() {
local file
file="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.sh"
file="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.sh"

assert_same "2" "$(helpers_test::find_total_in_subshell "" "$file")"
}

function test_find_total_tests_simple_file_bash() {
local file
file="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.bash"
file="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.bash"

assert_same "2" "$(helpers_test::find_total_in_subshell "" "$file")"
}

function test_find_total_tests_with_provider() {
local file
file="$(bashunit::current_dir)/fixtures/find_total_tests/provider_fixture.sh"
file="$(bashunit::current_dir)/../fixtures/find_total_tests/provider_fixture.sh"

assert_same "3" "$(helpers_test::find_total_in_subshell "" "$file")"
}

function test_find_total_tests_multiple_files() {
local file1
local file2
file1="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.sh"
file2="$(bashunit::current_dir)/fixtures/find_total_tests/provider_fixture.sh"
file1="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.sh"
file2="$(bashunit::current_dir)/../fixtures/find_total_tests/provider_fixture.sh"

assert_same "5" "$(helpers_test::find_total_in_subshell "" "$file1" "$file2")"
}

function test_find_total_tests_with_filter() {
local file1
local file2
file1="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.sh"
file2="$(bashunit::current_dir)/fixtures/find_total_tests/provider_fixture.sh"
file1="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.sh"
file2="$(bashunit::current_dir)/../fixtures/find_total_tests/provider_fixture.sh"

assert_same "3" "$(helpers_test::find_total_in_subshell "with_provider" "$file1" "$file2")"
}
Expand DownExpand Up@@ -574,28 +574,28 @@ function test_parse_file_path_filter_with_colon_in_path() {

function test_find_function_at_line_first_function() {
local file
file="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.sh"
file="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.sh"

assert_same "test_first" "$(bashunit::helper::find_function_at_line "$file" 4)"
}

function test_find_function_at_line_second_function() {
local file
file="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.sh"
file="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.sh"

assert_same "test_second" "$(bashunit::helper::find_function_at_line "$file" 8)"
}

function test_find_function_at_line_exact_function_line() {
local file
file="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.sh"
file="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.sh"

assert_same "test_first" "$(bashunit::helper::find_function_at_line "$file" 3)"
}

function test_find_function_at_line_before_any_function() {
local file
file="$(bashunit::current_dir)/fixtures/find_total_tests/simple_fixture.sh"
file="$(bashunit::current_dir)/../fixtures/find_total_tests/simple_fixture.sh"

assert_same "" "$(bashunit::helper::find_function_at_line "$file" 1)"
}
Expand Down
File renamed without changes.
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
#!/usr/bin/env bash
# shellcheck disable=SC2317

FIXTURE_TAGS_MAP="$(dirname "${BASH_SOURCE[0]}")/fixtures/tags_map/sample_tags.sh"
FIXTURE_TAGS_MAP_OTHER="$(dirname "${BASH_SOURCE[0]}")/fixtures/tags_map/sample_tags_other.sh"
FIXTURE_TAGS_MAP="$(dirname "${BASH_SOURCE[0]}")/../fixtures/tags_map/sample_tags.sh"
FIXTURE_TAGS_MAP_OTHER="$(dirname "${BASH_SOURCE[0]}")/../fixtures/tags_map/sample_tags_other.sh"

function tags_for() {
bashunit::helper::build_tags_map "$1"
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ function _learn_in_sandbox() {
sandbox="$(bashunit::temp_dir)"
# Resolve the repo root from this test file, not $BASHUNIT_ROOT_DIR: under
# `build.sh --verify` the running binary's root dir has no src/ (#834).
root_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
root_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"
# stdin is /dev/null so the `read -p "Press Enter to continue..."` prompts in
# the interactive paths hit EOF and return instead of blocking the suite.
# BASHUNIT_ROOT_DIR is set INSIDE the child (run_lesson_test shells out to the
Expand Down
File renamed without changes.
File renamed without changes.
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
ROOT_DIR=""

function set_up_before_script() {
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"
}

function src_files_sourced_by_entrypoint() {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ PKG_FILE=""
DOCS_PKG_FILE=""

function set_up_before_script() {
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"
PKG_FILE="$ROOT_DIR/package.json"
DOCS_PKG_FILE="$ROOT_DIR/docs/package.json"
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@ RELEASE_SCRIPT_DIR=""
FIXTURES_DIR=""

function set_up_before_script() {
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
FIXTURES_DIR="$(dirname "${BASH_SOURCE[0]}")/fixtures/release"
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"
FIXTURES_DIR="$(dirname "${BASH_SOURCE[0]}")/../fixtures/release"

# Source release.sh to get access to functions
# shellcheck source=/dev/null
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ RELEASE_SCRIPT_DIR=""
FIXTURE_DIR=""

function set_up_before_script() {
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"

# Source release.sh to get access to functions
# shellcheck source=/dev/null
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@ RELEASE_SCRIPT_DIR=""
FIXTURES_DIR=""

function set_up_before_script() {
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
FIXTURES_DIR="$(dirname "${BASH_SOURCE[0]}")/fixtures/release"
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"
FIXTURES_DIR="$(dirname "${BASH_SOURCE[0]}")/../fixtures/release"

# Source release.sh to get access to functions
# shellcheck source=/dev/null
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@ RELEASE_SCRIPT_DIR=""
FIXTURES_DIR=""

function set_up_before_script() {
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
FIXTURES_DIR="$(dirname "${BASH_SOURCE[0]}")/fixtures/release"
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"
FIXTURES_DIR="$(dirname "${BASH_SOURCE[0]}")/../fixtures/release"

# Source release.sh to get access to functions
# shellcheck source=/dev/null
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ fi
RELEASE_SCRIPT_DIR=""

function set_up_before_script() {
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
RELEASE_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"

# Source release.sh to get access to functions
# shellcheck source=/dev/null
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line numberDiff line numberDiff line change
Expand Up@@ -85,7 +85,7 @@ function test_module_load_detects_os_with_a_single_uname_call() {
# under `build.sh --verify` the built bashunit lives in a folder
# without src/, and sourcing through $BASHUNIT_ROOT_DIR crashed
# the whole verification run (silently, until #834 gated it).
source "$(dirname "${BASH_SOURCE[0]}")/../../src/system/check_os.sh"
source "$(dirname "${BASH_SOURCE[0]}")/../../../src/system/check_os.sh"

assert_have_been_called_times 1 uname
}
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading