Skip to content

Commit

Permalink
t1
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexSkrypnyk committed Aug 31, 2024
1 parent 9d3afaf commit 69249f8
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .vortex/tests/bats/_helper.bash
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ assert_files_not_present_common() {
assert_file_not_exists ".circleci/config.yml"
assert_file_not_exists "${webroot}/sites/default/settings.php"
assert_file_not_exists "${webroot}/sites/default/services.yml"
# Scaffolding files not exist.
# Drupal scaffold files not exist.
assert_file_not_exists "${webroot}/.editorconfig"
assert_file_not_exists "${webroot}/.eslintignore"
assert_file_not_exists "${webroot}/.gitattributes"
Expand Down Expand Up @@ -496,7 +496,7 @@ assert_files_present_drupal() {
# Comparing binary files.
assert_binary_files_equal "${LOCAL_REPO_DIR}/web/themes/custom/your_site_theme/screenshot.png" "${webroot}/themes/custom/${suffix}/screenshot.png"

# Drupal scaffolding files exist.
# Drupal scaffold files exist.
assert_file_exists "${webroot}/.editorconfig"
assert_file_exists "${webroot}/.eslintignore"
assert_file_exists "${webroot}/.gitattributes"
Expand Down
2 changes: 1 addition & 1 deletion .vortex/tests/bats/_helper.workflow.bash
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ assert_gitignore() {
git_add_all_commit "Commit fully built project"
fi

# Assert that scaffold files were added to the git repository.
# Assert that Drupal scaffold files were added to the git repository.
assert_git_file_is_tracked "${webroot}/.editorconfig"
assert_git_file_is_tracked "${webroot}/.eslintignore"
assert_git_file_is_tracked "${webroot}/.gitattributes"
Expand Down
12 changes: 6 additions & 6 deletions .vortex/tests/bats/install.existing.bats
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ load _helper.bash
git_add_all_commit "Second commit"

output=$(run_installer_quiet)
assert_output_contains "WELCOME TO DREVOPS QUIET INSTALLER"
assert_output_contains "WELCOME TO VORTEX QUIET INSTALLER"
assert_output_contains "Existing committed files will be modified."

# Assert no changes were made.
Expand All @@ -132,7 +132,7 @@ load _helper.bash
assert_file_not_contains ".env" 'SOMEVAR="someval"'
}

@test "Install into existing: git project; no Vortex; adding DrevOps and updating DrevOps" {
@test "Install into existing: git project; no Vortex; adding Vortex and updating Vortex" {
# Add custom files
touch "test1.txt"
# File resides in directory that is included in Vortex when initialised.
Expand All @@ -154,7 +154,7 @@ load _helper.bash

install_dependencies_stub

git_add_all_commit "Init DrevOps"
git_add_all_commit "Init Vortex"

# Assert that custom file preserved.
assert_file_exists "test1.txt"
Expand All @@ -169,7 +169,7 @@ load _helper.bash
git_add "docker-compose.yml" "${LOCAL_REPO_DIR}"
echo "# Some change to non-required file" >>"${LOCAL_REPO_DIR}/web/themes/custom/your_site_theme/.eslintrc.json"
git_add "web/themes/custom/your_site_theme/.eslintrc.json" "${LOCAL_REPO_DIR}"
git_commit "New version of DrevOps" "${LOCAL_REPO_DIR}"
git_commit "New version of Vortex" "${LOCAL_REPO_DIR}"

# Run install to update to the latest Vortex version.
run_installer_quiet
Expand All @@ -194,8 +194,8 @@ load _helper.bash
touch ".docker/test2.txt"

output=$(run_installer_quiet)
assert_output_contains "WELCOME TO DREVOPS QUIET INSTALLER"
assert_output_not_contains "It looks like DrevOps scaffold is already installed into this project"
assert_output_contains "WELCOME TO VORTEX QUIET INSTALLER"
assert_output_not_contains "It looks like Vortex is already installed into this project"

install_dependencies_stub

Expand Down

1 comment on commit 69249f8

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.