diff options
| author | Leonel Galán <leonel@getstealz.com> | 2017-06-16 15:09:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-16 15:09:15 -0400 |
| commit | 095036467e4e06e56452da94077500d428dd0eed (patch) | |
| tree | 3443e6779bf5a1d0f73f3c6ceb5f22cdee12e303 /activejob/test/support | |
| parent | 0804e58e1e6a52190a950f863622102b6b21ccb8 (diff) | |
| parent | b55cf266f9ccadf49276de230a8b0c2076f05202 (diff) | |
| download | rails-095036467e4e06e56452da94077500d428dd0eed.tar.gz rails-095036467e4e06e56452da94077500d428dd0eed.tar.bz2 rails-095036467e4e06e56452da94077500d428dd0eed.zip | |
Merge branch 'master' into bug/filtered_parameters_class
Diffstat (limited to 'activejob/test/support')
| -rw-r--r-- | activejob/test/support/delayed_job/delayed/backend/test.rb | 3 | ||||
| -rw-r--r-- | activejob/test/support/integration/dummy_app_template.rb | 2 | ||||
| -rw-r--r-- | activejob/test/support/integration/helper.rb | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/activejob/test/support/delayed_job/delayed/backend/test.rb b/activejob/test/support/delayed_job/delayed/backend/test.rb index 98d731ff1e..68288c062b 100644 --- a/activejob/test/support/delayed_job/delayed/backend/test.rb +++ b/activejob/test/support/delayed_job/delayed/backend/test.rb @@ -19,8 +19,7 @@ module Delayed include Delayed::Backend::Base - cattr_accessor :id - self.id = 0 + cattr_accessor :id, default: 0 def initialize(hash = {}) self.attempts = 0 diff --git a/activejob/test/support/integration/dummy_app_template.rb b/activejob/test/support/integration/dummy_app_template.rb index 29a5691f30..14fe3c9adc 100644 --- a/activejob/test/support/integration/dummy_app_template.rb +++ b/activejob/test/support/integration/dummy_app_template.rb @@ -5,7 +5,7 @@ end rails_command("db:migrate") initializer "activejob.rb", <<-CODE -require "#{File.expand_path("../jobs_manager.rb", __FILE__)}" +require "#{File.expand_path("jobs_manager.rb", __dir__)}" JobsManager.current_manager.setup CODE diff --git a/activejob/test/support/integration/helper.rb b/activejob/test/support/integration/helper.rb index 626b932cce..545b62752e 100644 --- a/activejob/test/support/integration/helper.rb +++ b/activejob/test/support/integration/helper.rb @@ -7,7 +7,7 @@ require "rails/generators/rails/app/app_generator" require "tmpdir" dummy_app_path = Dir.mktmpdir + "/dummy" -dummy_app_template = File.expand_path("../dummy_app_template.rb", __FILE__) +dummy_app_template = File.expand_path("dummy_app_template.rb", __dir__) args = Rails::Generators::ARGVScrubber.new(["new", dummy_app_path, "--skip-gemfile", "--skip-bundle", "--skip-git", "--skip-spring", "-d", "sqlite3", "--skip-javascript", "--force", "--quiet", "--template", dummy_app_template]).prepare! |