Update gems of test app used in integration tests

rud · Nov 20, 2017 · 2296e27 · 2296e27
1 parent 862cbc1
commit 2296e27
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 15 deletions.
diff --git a/spec/integration/rails-app-5.1/Gemfile.lock b/spec/integration/rails-app-5.1/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: vendor/gems/active_elastic_job-current
   specs:
-    active_elastic_job (2.0.0)
+    active_elastic_job (2.0.1)
       aws-sdk (~> 2)
       rails (>= 4.2)
 
@@ -46,14 +46,14 @@ GEM
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     arel (7.1.4)
-    aws-sdk (2.7.3)
-      aws-sdk-resources (= 2.7.3)
-    aws-sdk-core (2.7.3)
+    aws-sdk (2.10.82)
+      aws-sdk-resources (= 2.10.82)
+    aws-sdk-core (2.10.82)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.7.3)
-      aws-sdk-core (= 2.7.3)
-    aws-sigv4 (1.0.0)
+    aws-sdk-resources (2.10.82)
+      aws-sdk-core (= 2.10.82)
+    aws-sigv4 (1.0.2)
     builder (3.2.3)
     coffee-rails (4.2.1)
       coffee-script (>= 2.2.0)

diff --git a/spec/integration/rails-app-5.1/config/application.rb b/spec/integration/rails-app-5.1/config/application.rb
@@ -20,9 +20,6 @@ class Application < Rails::Application
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
 
-    # Do not swallow errors in after_commit/after_rollback callbacks.
-    config.active_record.raise_in_transactional_callbacks = true
-
     config.active_job.queue_adapter = :active_elastic_job
 
     config.force_ssl = true

diff --git a/spec/integration/rails-app-5.1/config/environments/production.rb b/spec/integration/rails-app-5.1/config/environments/production.rb
@@ -76,9 +76,4 @@
 
   # Do not dump schema after migrations.
   config.active_record.dump_schema_after_migration = false
-
-  # Test gem's configuration
-  config.active_elastic_job.process_jobs = true
-  config.active_elastic_job.aws_credentials = Aws::Credentials.new(ENV['AWS_ACCESS_KEY_ID'], ENV['AWS_SECRET_ACCESS_KEY'])
-  config.active_elastic_job.secret_key_base = 's3krit'
 end