From 60d13d638ecc9083a897cffafe4230f134303c4f Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 18 May 2014 12:30:57 +0200 Subject: Run tests through Rake --- Rakefile | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 Rakefile (limited to 'Rakefile') diff --git a/Rakefile b/Rakefile new file mode 100644 index 0000000000..7e9f53ef41 --- /dev/null +++ b/Rakefile @@ -0,0 +1,27 @@ +dir = File.dirname(__FILE__) + +require 'rake/testtask' + +task :default => :test + +Rake::TestTask.new do |t| + t.libs << "test" + t.test_files = Dir.glob("#{dir}/test/cases/**/*_test.rb").sort + t.warning = true + t.verbose = true +end + +require 'rubygems/package_task' + +spec = eval(File.read("#{dir}/activejob.gemspec")) + +Gem::PackageTask.new(spec) do |p| + p.gem_spec = spec +end + +desc "Release to rubygems" +task :release => :package do + require 'rake/gemcutter' + Rake::Gemcutter::Tasks.new(spec).define + Rake::Task['gem:push'].invoke +end -- cgit v1.2.3 From eed52c8808fceb0004e488f77f0bc6904f7aaddf Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 18 May 2014 13:11:00 +0200 Subject: Add ResqueAdapter and provide test infrastructure for the now multiple adapters --- Rakefile | 41 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 36 insertions(+), 5 deletions(-) (limited to 'Rakefile') diff --git a/Rakefile b/Rakefile index 7e9f53ef41..2c94fbcace 100644 --- a/Rakefile +++ b/Rakefile @@ -2,13 +2,44 @@ dir = File.dirname(__FILE__) require 'rake/testtask' +def run_without_aborting(*tasks) + errors = [] + + tasks.each do |task| + begin + Rake::Task[task].invoke + rescue Exception + errors << task + end + end + + abort "Errors running #{errors.join(', ')}" if errors.any? +end + + + task :default => :test -Rake::TestTask.new do |t| - t.libs << "test" - t.test_files = Dir.glob("#{dir}/test/cases/**/*_test.rb").sort - t.warning = true - t.verbose = true +desc 'Run all adapter tests' +task :test do + tasks = %w(test_inline test_resque) + run_without_aborting(*tasks) +end + + +%w( inline resque ).each do |adapter| + Rake::TestTask.new("test_#{adapter}") do |t| + t.libs << 'test' + t.test_files = FileList['test/cases/**/*_test.rb'] + t.verbose = true + end + + namespace adapter do + task :test => "test_#{adapter}" + task(:env) { ENV['AJADAPTER'] = adapter } + end + + task "test_#{adapter}" => "#{adapter}:env" end require 'rubygems/package_task' -- cgit v1.2.3 From a712c07c7ff312aca9c72e9720baf59f779e0cc2 Mon Sep 17 00:00:00 2001 From: Abdelkader Boudih Date: Sun, 18 May 2014 19:02:02 +0000 Subject: Add Sidekiq adapter/wrapper fixes #3 --- Rakefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Rakefile') diff --git a/Rakefile b/Rakefile index 2c94fbcace..82522f4a89 100644 --- a/Rakefile +++ b/Rakefile @@ -22,12 +22,12 @@ task :default => :test desc 'Run all adapter tests' task :test do - tasks = %w(test_inline test_resque) + tasks = %w(test_inline test_resque test_sidekiq) run_without_aborting(*tasks) end -%w( inline resque ).each do |adapter| +%w( inline resque sidekiq ).each do |adapter| Rake::TestTask.new("test_#{adapter}") do |t| t.libs << 'test' t.test_files = FileList['test/cases/**/*_test.rb'] -- cgit v1.2.3 From 68543de83612049e3254f7243b575039f102cd49 Mon Sep 17 00:00:00 2001 From: Abdelkader Boudih Date: Sun, 18 May 2014 19:20:06 +0000 Subject: Add Sucker Punch adapter/wrapper --- Rakefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Rakefile') diff --git a/Rakefile b/Rakefile index 82522f4a89..7f38657160 100644 --- a/Rakefile +++ b/Rakefile @@ -22,12 +22,12 @@ task :default => :test desc 'Run all adapter tests' task :test do - tasks = %w(test_inline test_resque test_sidekiq) + tasks = %w(test_inline test_resque test_sidekiq test_sucker_punch) run_without_aborting(*tasks) end -%w( inline resque sidekiq ).each do |adapter| +%w( inline resque sidekiq sucker_punch).each do |adapter| Rake::TestTask.new("test_#{adapter}") do |t| t.libs << 'test' t.test_files = FileList['test/cases/**/*_test.rb'] -- cgit v1.2.3 From d3ff144f89a1d42118f84f075fa3cc9b94fb190e Mon Sep 17 00:00:00 2001 From: Cristian Bica Date: Mon, 19 May 2014 00:47:35 +0300 Subject: Implemented delayed job --- Rakefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Rakefile') diff --git a/Rakefile b/Rakefile index 7f38657160..d0d837602a 100644 --- a/Rakefile +++ b/Rakefile @@ -22,12 +22,12 @@ task :default => :test desc 'Run all adapter tests' task :test do - tasks = %w(test_inline test_resque test_sidekiq test_sucker_punch) + tasks = %w(test_inline test_resque test_sidekiq test_sucker_punch test_delayed_job) run_without_aborting(*tasks) end -%w( inline resque sidekiq sucker_punch).each do |adapter| +%w( inline resque sidekiq sucker_punch delayed_job).each do |adapter| Rake::TestTask.new("test_#{adapter}") do |t| t.libs << 'test' t.test_files = FileList['test/cases/**/*_test.rb'] -- cgit v1.2.3 From 704b17bd0a11c3691b74ca30def7a20ed0a0b5e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Mon, 19 May 2014 08:18:42 -0300 Subject: Use bundle gem tasks --- Rakefile | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'Rakefile') diff --git a/Rakefile b/Rakefile index d0d837602a..c602ee53da 100644 --- a/Rakefile +++ b/Rakefile @@ -1,4 +1,4 @@ -dir = File.dirname(__FILE__) +require 'bundler/gem_tasks' require 'rake/testtask' @@ -41,18 +41,3 @@ end task "test_#{adapter}" => "#{adapter}:env" end - -require 'rubygems/package_task' - -spec = eval(File.read("#{dir}/activejob.gemspec")) - -Gem::PackageTask.new(spec) do |p| - p.gem_spec = spec -end - -desc "Release to rubygems" -task :release => :package do - require 'rake/gemcutter' - Rake::Gemcutter::Tasks.new(spec).define - Rake::Task['gem:push'].invoke -end -- cgit v1.2.3 From 430228ea56341d8bb0bb9e4503fffea66c1b8251 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Mon, 19 May 2014 08:19:20 -0300 Subject: :scissors: --- Rakefile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'Rakefile') diff --git a/Rakefile b/Rakefile index c602ee53da..5242926c7f 100644 --- a/Rakefile +++ b/Rakefile @@ -16,8 +16,6 @@ def run_without_aborting(*tasks) abort "Errors running #{errors.join(', ')}" if errors.any? end - - task :default => :test desc 'Run all adapter tests' @@ -26,8 +24,7 @@ task :test do run_without_aborting(*tasks) end - -%w( inline resque sidekiq sucker_punch delayed_job).each do |adapter| +%w(inline resque sidekiq sucker_punch delayed_job).each do |adapter| Rake::TestTask.new("test_#{adapter}") do |t| t.libs << 'test' t.test_files = FileList['test/cases/**/*_test.rb'] -- cgit v1.2.3 From 5cad2c1b8aa1139ba3de45b3ce26b9d5c9931f6c Mon Sep 17 00:00:00 2001 From: Cristian Bica Date: Tue, 20 May 2014 00:01:56 +0300 Subject: Implemented queue_classic adapter --- Rakefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Rakefile') diff --git a/Rakefile b/Rakefile index 5242926c7f..2b8b81248d 100644 --- a/Rakefile +++ b/Rakefile @@ -20,11 +20,11 @@ task :default => :test desc 'Run all adapter tests' task :test do - tasks = %w(test_inline test_resque test_sidekiq test_sucker_punch test_delayed_job) + tasks = %w(test_inline test_resque test_sidekiq test_sucker_punch test_delayed_job test_queue_classic) run_without_aborting(*tasks) end -%w(inline resque sidekiq sucker_punch delayed_job).each do |adapter| +%w(inline resque sidekiq sucker_punch delayed_job queue_classic).each do |adapter| Rake::TestTask.new("test_#{adapter}") do |t| t.libs << 'test' t.test_files = FileList['test/cases/**/*_test.rb'] -- cgit v1.2.3 From 1b71fe59b8cd6c7347729703c064b64866b3502e Mon Sep 17 00:00:00 2001 From: John DeSilva Date: Tue, 20 May 2014 00:56:08 +0200 Subject: Add Sneakers wrapper --- Rakefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Rakefile') diff --git a/Rakefile b/Rakefile index 2b8b81248d..e0d8e8e0d8 100644 --- a/Rakefile +++ b/Rakefile @@ -20,11 +20,11 @@ task :default => :test desc 'Run all adapter tests' task :test do - tasks = %w(test_inline test_resque test_sidekiq test_sucker_punch test_delayed_job test_queue_classic) + tasks = %w(test_inline test_resque test_sidekiq test_sucker_punch test_delayed_job test_queue_classic test_sneakers) run_without_aborting(*tasks) end -%w(inline resque sidekiq sucker_punch delayed_job queue_classic).each do |adapter| +%w(inline resque sidekiq sucker_punch delayed_job queue_classic sneakers).each do |adapter| Rake::TestTask.new("test_#{adapter}") do |t| t.libs << 'test' t.test_files = FileList['test/cases/**/*_test.rb'] -- cgit v1.2.3 From 6d009504a02fecb822820e18abd69dd569f72e82 Mon Sep 17 00:00:00 2001 From: Abdelkader Boudih Date: Mon, 19 May 2014 18:09:45 +0000 Subject: Add Que Adapter/Wrapper --- Rakefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Rakefile') diff --git a/Rakefile b/Rakefile index e0d8e8e0d8..933c049a68 100644 --- a/Rakefile +++ b/Rakefile @@ -20,11 +20,11 @@ task :default => :test desc 'Run all adapter tests' task :test do - tasks = %w(test_inline test_resque test_sidekiq test_sucker_punch test_delayed_job test_queue_classic test_sneakers) + tasks = %w(test_inline test_delayed_job test_que test_queue_classic test_resque test_sidekiq test_sneakers test_sucker_punch) run_without_aborting(*tasks) end -%w(inline resque sidekiq sucker_punch delayed_job queue_classic sneakers).each do |adapter| +%w(inline delayed_job que queue_classic resque sidekiq sneakers sucker_punch).each do |adapter| Rake::TestTask.new("test_#{adapter}") do |t| t.libs << 'test' t.test_files = FileList['test/cases/**/*_test.rb'] -- cgit v1.2.3 From 243afc061cf527bebf6c76956c53c5cb637876c6 Mon Sep 17 00:00:00 2001 From: Dimitar Kostov Date: Tue, 20 May 2014 14:03:46 +0300 Subject: Adds backburner adapter --- Rakefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Rakefile') diff --git a/Rakefile b/Rakefile index 933c049a68..8ab372e08c 100644 --- a/Rakefile +++ b/Rakefile @@ -20,11 +20,11 @@ task :default => :test desc 'Run all adapter tests' task :test do - tasks = %w(test_inline test_delayed_job test_que test_queue_classic test_resque test_sidekiq test_sneakers test_sucker_punch) + tasks = %w(test_inline test_delayed_job test_que test_queue_classic test_resque test_sidekiq test_sneakers test_sucker_punch test_backburner) run_without_aborting(*tasks) end -%w(inline delayed_job que queue_classic resque sidekiq sneakers sucker_punch).each do |adapter| +%w(inline delayed_job que queue_classic resque sidekiq sneakers sucker_punch backburner).each do |adapter| Rake::TestTask.new("test_#{adapter}") do |t| t.libs << 'test' t.test_files = FileList['test/cases/**/*_test.rb'] -- cgit v1.2.3 From 8e19b6af4a1253838a43215b15696110f5f43bb2 Mon Sep 17 00:00:00 2001 From: Kalman Hazins Date: Fri, 23 May 2014 10:06:16 -0400 Subject: Change to 1.9 symbol-hash syntax --- Rakefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Rakefile') diff --git a/Rakefile b/Rakefile index 8ab372e08c..aa48ea58e4 100644 --- a/Rakefile +++ b/Rakefile @@ -16,7 +16,7 @@ def run_without_aborting(*tasks) abort "Errors running #{errors.join(', ')}" if errors.any? end -task :default => :test +task default: :test desc 'Run all adapter tests' task :test do @@ -32,7 +32,7 @@ end end namespace adapter do - task :test => "test_#{adapter}" + task test: "test_#{adapter}" task(:env) { ENV['AJADAPTER'] = adapter } end -- cgit v1.2.3 From b36d4da340fe81827601f9c192aefb2982cbcefb Mon Sep 17 00:00:00 2001 From: Cristian Bica Date: Thu, 12 Jun 2014 11:14:42 +0300 Subject: Implemented :qu adapter --- Rakefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Rakefile') diff --git a/Rakefile b/Rakefile index aa48ea58e4..5780410eda 100644 --- a/Rakefile +++ b/Rakefile @@ -20,11 +20,11 @@ task default: :test desc 'Run all adapter tests' task :test do - tasks = %w(test_inline test_delayed_job test_que test_queue_classic test_resque test_sidekiq test_sneakers test_sucker_punch test_backburner) + tasks = %w(test_inline test_delayed_job test_qu test_que test_queue_classic test_resque test_sidekiq test_sneakers test_sucker_punch test_backburner) run_without_aborting(*tasks) end -%w(inline delayed_job que queue_classic resque sidekiq sneakers sucker_punch backburner).each do |adapter| +%w(inline delayed_job qu que queue_classic resque sidekiq sneakers sucker_punch backburner).each do |adapter| Rake::TestTask.new("test_#{adapter}") do |t| t.libs << 'test' t.test_files = FileList['test/cases/**/*_test.rb'] -- cgit v1.2.3 From 664546c208c406bba08b8eda2e6a600154d7232e Mon Sep 17 00:00:00 2001 From: Cristian Bica Date: Tue, 5 Aug 2014 09:05:14 +0300 Subject: Integration testing --- Rakefile | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) (limited to 'Rakefile') diff --git a/Rakefile b/Rakefile index 5780410eda..b2910de81d 100644 --- a/Rakefile +++ b/Rakefile @@ -18,13 +18,15 @@ end task default: :test +ADAPTERS = %w(inline delayed_job qu que queue_classic resque sidekiq sneakers sucker_punch backburner) + desc 'Run all adapter tests' task :test do - tasks = %w(test_inline test_delayed_job test_qu test_que test_queue_classic test_resque test_sidekiq test_sneakers test_sucker_punch test_backburner) + tasks = ADAPTERS.map{|a| "test_#{a}" }+["integration_test"] run_without_aborting(*tasks) end -%w(inline delayed_job qu que queue_classic resque sidekiq sneakers sucker_punch backburner).each do |adapter| +ADAPTERS.each do |adapter| Rake::TestTask.new("test_#{adapter}") do |t| t.libs << 'test' t.test_files = FileList['test/cases/**/*_test.rb'] @@ -38,3 +40,29 @@ end task "test_#{adapter}" => "#{adapter}:env" end + + + +desc 'Run all adapter integration tests' +task :integration_test do + tasks = (ADAPTERS-['inline']).map{|a| "integration_test_#{a}" } + run_without_aborting(*tasks) +end + +(ADAPTERS-['inline']).each do |adapter| + Rake::TestTask.new("integration_test_#{adapter}") do |t| + t.libs << 'test' + t.test_files = FileList['test/integration/**/*_test.rb'] + t.verbose = true + end + + namespace "integration_#{adapter}" do + task test: "integration_test_#{adapter}" + task(:env) do + ENV['AJADAPTER'] = adapter + ENV['AJ_INTEGRATION_TESTS'] = "1" + end + end + + task "integration_test_#{adapter}" => "integration_#{adapter}:env" +end -- cgit v1.2.3 From 0c232779ece1ff6bf9bce9d55c54ea19867a2170 Mon Sep 17 00:00:00 2001 From: Abdelkader Boudih Date: Tue, 12 Aug 2014 09:29:21 +0000 Subject: Remove activejob integration tests --- Rakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Rakefile') diff --git a/Rakefile b/Rakefile index 0737afd089..db27105cc3 100644 --- a/Rakefile +++ b/Rakefile @@ -11,7 +11,7 @@ task :build => "all:build" desc "Release all gems to rubygems and create a tag" task :release => "all:release" -PROJECTS = %w(activesupport activemodel actionpack actionview actionmailer activerecord railties) +PROJECTS = %w(activesupport activemodel actionpack actionview actionmailer activerecord railties activejob) desc 'Run all tests by default' task :default => %w(test test:isolated) -- cgit v1.2.3