diff --git a/config/environment.rb b/config/environment.rb index b55ad3d5..69e3ae4a 100755 --- a/config/environment.rb +++ b/config/environment.rb @@ -19,9 +19,6 @@ end @org_name = ENV['ORG_NAME'] || 'default_organization' puts "config files .env .env.#{@env} ./config/settings.#{@env}.yml#{ @env != 'test' ? " ./config/#{@org_name}.yml": " "} #{ @env != 'test' ? " ./config/#{@org_name}.#{@env}.yml": " "} #{ @env == 'test' ? "./config/settings.test.yml" : ""}" -# unless @ignore_dotenv -# Dotenv.load ".env.#{@env}" if File.file?(".env.#{@env}") -# end if Rails.env == 'test' Settings.add_source!("./config/settings.test.yml") else diff --git a/script/test.sh b/script/test.sh index c6c33d5d..38faac5c 100755 --- a/script/test.sh +++ b/script/test.sh @@ -1,2 +1,2 @@ #!/bin/bash -npm ci && rake db:create db:structure:load db:migrate && RAILS_ENV=test rake db:create db:structure:load test:prepare && rake spec \ No newline at end of file +npm ci && rake db:create db:structure:load db:migrate && RAILS_ENV=test rake db:create db:structure:load test:prepare && rake spec && npm run build-all && npx jest \ No newline at end of file