Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove yarn integrity tests #105

Merged
merged 1 commit into from
Jan 12, 2020
Merged

Remove yarn integrity tests #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 1 addition & 3 deletions .github/workflows/test-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,5 @@ jobs:
run: docker-compose build
- name: Initialize database
run: docker-compose run web bin/initialize.sh
- name: Run tests
- name: Run ruby tests
run: docker-compose run web bin/test.sh --ruby
- name: Yarn integrity check
run: docker-compose run web bin/test.sh --yarn-integrity
16 changes: 1 addition & 15 deletions bin/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
SCRIPT_NAME="test.sh"

RUBY_TESTS=false
CHECK_YARN_INTEGRETY=false
HELP=false

# Parse command line args
Expand All @@ -13,10 +12,6 @@ do
key="$1"

case $key in
-Y|--yarn-integrity)
CHECK_YARN_INTEGRETY=true
shift # past argument
;;
-R|--ruby)
RUBY_TESTS=true
shift # past argument
Expand Down Expand Up @@ -44,7 +39,6 @@ if $HELP ; then
echo "$SCRIPT_NAME [no parameters]"
echo " -h or --help Print this message"
echo " -R or --ruby Run ruby tests"
echo " -Y or --yarn-integrity Run yarn integrity check"
echo
echo "Note: calling this script with no options will run all"
echo "tests. Calling this script with any subset of the tests will"
Expand All @@ -54,20 +48,12 @@ fi

EXIT_STATUS="0"

if $RUBY_TESTS || ! $CHECK_YARN_INTEGRETY ; then
if $RUBY_TESTS || true; then
echo
echo "Running ruby tests..."
echo
rake test || \
EXIT_STATUS="1"
fi

if $CHECK_YARN_INTEGRETY || ! $RUBY_TESTS ; then
echo
echo "Running yarn integrity check..."
echo
yarn check --integrity || \
EXIT_STATUS="1"
fi

exit $EXIT_STATUS
5 changes: 4 additions & 1 deletion config/environments/development.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
config.action_mailer.raise_delivery_errors = true

config.action_mailer.perform_caching = false

# Print deprecation notices to the Rails logger.
config.active_support.deprecation = :log

Expand All @@ -70,4 +70,7 @@
# routes, locales, etc. This feature depends on the listen gem.
config.file_watcher = ActiveSupport::EventedFileUpdateChecker

# Turn off webpacker yarn integrity check - this is deprecated anyways:
# https://github.com/yarnpkg/rfcs/pull/106
config.webpacker.check_yarn_integrity = false
end