diff options
author | Abdelkader Boudih <terminale@gmail.com> | 2014-08-12 09:29:21 +0000 |
---|---|---|
committer | Abdelkader Boudih <terminale@gmail.com> | 2014-08-12 10:07:21 +0000 |
commit | 0c232779ece1ff6bf9bce9d55c54ea19867a2170 (patch) | |
tree | fd833a906bdf4a982d01046f9cdfe6d0d720fdc7 /activejob/test | |
parent | a75f085941b2d6aed160f5f2f7e64e5fc7e03826 (diff) | |
download | rails-0c232779ece1ff6bf9bce9d55c54ea19867a2170.tar.gz rails-0c232779ece1ff6bf9bce9d55c54ea19867a2170.tar.bz2 rails-0c232779ece1ff6bf9bce9d55c54ea19867a2170.zip |
Remove activejob integration tests
Diffstat (limited to 'activejob/test')
40 files changed, 2 insertions, 409 deletions
diff --git a/activejob/test/cases/logging_test.rb b/activejob/test/cases/logging_test.rb index 537702edd4..a4c010c7bd 100644 --- a/activejob/test/cases/logging_test.rb +++ b/activejob/test/cases/logging_test.rb @@ -1,5 +1,6 @@ require 'helper' require "active_support/log_subscriber/test_helper" +require 'jobs/hello_job' require 'jobs/logging_job' require 'jobs/nested_job' diff --git a/activejob/test/dummy/Rakefile b/activejob/test/dummy/Rakefile deleted file mode 100644 index 9866295e6a..0000000000 --- a/activejob/test/dummy/Rakefile +++ /dev/null @@ -1,3 +0,0 @@ -require 'sneakers/tasks' -require File.expand_path('../config/application', __FILE__) -Rails.application.load_tasks diff --git a/activejob/test/dummy/app/assets/images/.keep b/activejob/test/dummy/app/assets/images/.keep deleted file mode 100644 index e69de29bb2..0000000000 --- a/activejob/test/dummy/app/assets/images/.keep +++ /dev/null diff --git a/activejob/test/dummy/app/controllers/application_controller.rb b/activejob/test/dummy/app/controllers/application_controller.rb deleted file mode 100644 index 1c07694e9d..0000000000 --- a/activejob/test/dummy/app/controllers/application_controller.rb +++ /dev/null @@ -1,3 +0,0 @@ -class ApplicationController < ActionController::Base - protect_from_forgery with: :exception -end diff --git a/activejob/test/dummy/app/controllers/concerns/.keep b/activejob/test/dummy/app/controllers/concerns/.keep deleted file mode 100644 index e69de29bb2..0000000000 --- a/activejob/test/dummy/app/controllers/concerns/.keep +++ /dev/null diff --git a/activejob/test/dummy/app/helpers/application_helper.rb b/activejob/test/dummy/app/helpers/application_helper.rb deleted file mode 100644 index de6be7945c..0000000000 --- a/activejob/test/dummy/app/helpers/application_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module ApplicationHelper -end diff --git a/activejob/test/dummy/app/jobs/test_job.rb b/activejob/test/dummy/app/jobs/test_job.rb deleted file mode 100644 index 281771a851..0000000000 --- a/activejob/test/dummy/app/jobs/test_job.rb +++ /dev/null @@ -1,9 +0,0 @@ -class TestJob < ActiveJob::Base - queue_as :default - - def perform(x) - File.open(Rails.root.join("tmp/#{x}"), "w+") do |f| - f.write x - end - end -end diff --git a/activejob/test/dummy/app/mailers/.keep b/activejob/test/dummy/app/mailers/.keep deleted file mode 100644 index e69de29bb2..0000000000 --- a/activejob/test/dummy/app/mailers/.keep +++ /dev/null diff --git a/activejob/test/dummy/app/models/.keep b/activejob/test/dummy/app/models/.keep deleted file mode 100644 index e69de29bb2..0000000000 --- a/activejob/test/dummy/app/models/.keep +++ /dev/null diff --git a/activejob/test/dummy/app/models/concerns/.keep b/activejob/test/dummy/app/models/concerns/.keep deleted file mode 100644 index e69de29bb2..0000000000 --- a/activejob/test/dummy/app/models/concerns/.keep +++ /dev/null diff --git a/activejob/test/dummy/config.ru b/activejob/test/dummy/config.ru deleted file mode 100644 index 5bc2a619e8..0000000000 --- a/activejob/test/dummy/config.ru +++ /dev/null @@ -1,4 +0,0 @@ -# This file is used by Rack-based servers to start the application. - -require ::File.expand_path('../config/environment', __FILE__) -run Rails.application diff --git a/activejob/test/dummy/config/application.rb b/activejob/test/dummy/config/application.rb deleted file mode 100644 index 8b06039a68..0000000000 --- a/activejob/test/dummy/config/application.rb +++ /dev/null @@ -1,9 +0,0 @@ -require File.expand_path('../boot', __FILE__) -require 'rails/all' -Bundler.require(*Rails.groups) - -module Dummy - class Application < Rails::Application - end -end - diff --git a/activejob/test/dummy/config/boot.rb b/activejob/test/dummy/config/boot.rb deleted file mode 100644 index 6266cfc509..0000000000 --- a/activejob/test/dummy/config/boot.rb +++ /dev/null @@ -1,5 +0,0 @@ -# Set up gems listed in the Gemfile. -ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__) - -require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE']) -$LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__) diff --git a/activejob/test/dummy/config/database.yml b/activejob/test/dummy/config/database.yml deleted file mode 100644 index f5f3aaf1fa..0000000000 --- a/activejob/test/dummy/config/database.yml +++ /dev/null @@ -1,3 +0,0 @@ -test: - adapter: sqlite3 - database: "db/test.sqlite3" diff --git a/activejob/test/dummy/config/environment.rb b/activejob/test/dummy/config/environment.rb deleted file mode 100644 index 7fd2f91b8f..0000000000 --- a/activejob/test/dummy/config/environment.rb +++ /dev/null @@ -1,2 +0,0 @@ -require File.expand_path('../application', __FILE__) -Rails.application.initialize! diff --git a/activejob/test/dummy/config/environments/test.rb b/activejob/test/dummy/config/environments/test.rb deleted file mode 100644 index ff0318412f..0000000000 --- a/activejob/test/dummy/config/environments/test.rb +++ /dev/null @@ -1,13 +0,0 @@ -Rails.application.configure do - config.cache_classes = true - config.eager_load = false - config.serve_static_assets = true - config.static_cache_control = 'public, max-age=3600' - config.consider_all_requests_local = true - config.action_controller.perform_caching = false - config.action_dispatch.show_exceptions = false - config.action_controller.allow_forgery_protection = false - config.action_mailer.delivery_method = :test - config.active_support.deprecation = :stderr - config.log_level = :debug -end diff --git a/activejob/test/dummy/config/initializers/activejob.rb b/activejob/test/dummy/config/initializers/activejob.rb deleted file mode 100644 index 5fcde86c96..0000000000 --- a/activejob/test/dummy/config/initializers/activejob.rb +++ /dev/null @@ -1,65 +0,0 @@ -case ENV['AJADAPTER'] -when "delayed_job" - ActiveJob::Base.queue_adapter = :delayed_job -when "sidekiq" - ActiveJob::Base.queue_adapter = :sidekiq -when "resque" - ActiveJob::Base.queue_adapter = :resque - Resque.redis = Redis::Namespace.new 'active_jobs_int_test', redis: Redis.connect(url: "tcp://127.0.0.1:6379/12", :thread_safe => true) - Resque.logger = Rails.logger -when 'qu' - ActiveJob::Base.queue_adapter = :qu - ENV['REDISTOGO_URL'] = "tcp://127.0.0.1:6379/12" - backend = Qu::Backend::Redis.new - backend.namespace = "active_jobs_int_test" - Qu.backend = backend - Qu.logger = Rails.logger - Qu.interval = 0.5 -when 'que' - ActiveJob::Base.queue_adapter = :que - QUE_URL = ENV['QUE_DATABASE_URL'] || 'postgres://localhost/active_jobs_que_int_test' - uri = URI.parse(QUE_URL) - user = uri.user||ENV['USER'] - pass = uri.password - db = uri.path[1..-1] - %x{#{"PGPASSWORD=\"#{pass}\"" if pass} psql -c 'drop database "#{db}"' -U #{user} -t template1} - %x{#{"PGPASSWORD=\"#{pass}\"" if pass} psql -c 'create database "#{db}"' -U #{user} -t template1} - Que.connection = Sequel.connect(QUE_URL) - Que.migrate! - Que.mode = :off - Que.worker_count = 1 -when 'queue_classic' - ENV['QC_DATABASE_URL'] ||= 'postgres://localhost/active_jobs_qc_int_test' - ENV['QC_LISTEN_TIME'] = "0.5" - ActiveJob::Base.queue_adapter = :queue_classic - uri = URI.parse(ENV['QC_DATABASE_URL']) - user = uri.user||ENV['USER'] - pass = uri.password - db = uri.path[1..-1] - %x{#{"PGPASSWORD=\"#{pass}\"" if pass} psql -c 'drop database "#{db}"' -U #{user} -t template1} - %x{#{"PGPASSWORD=\"#{pass}\"" if pass} psql -c 'create database "#{db}"' -U #{user} -t template1} - QC::Setup.create -when 'sidekiq' - ActiveJob::Base.queue_adapter = :sidekiq -when 'sneakers' - ActiveJob::Base.queue_adapter = :sneakers - Sneakers.configure :heartbeat => 2, - :amqp => 'amqp://guest:guest@localhost:5672', - :vhost => '/', - :exchange => 'active_jobs_sneakers_int_test', - :exchange_type => :direct, - :daemonize => true, - :threads => 1, - :workers => 1, - :pid_path => Rails.root.join("tmp/sneakers.pid").to_s, - :log => Rails.root.join("log/sneakers.log").to_s -when 'sucker_punch' - ActiveJob::Base.queue_adapter = :sucker_punch -when 'backburner' - ActiveJob::Base.queue_adapter = :backburner - Backburner.configure do |config| - config.logger = Rails.logger - end -else - ActiveJob::Base.queue_adapter = nil -end diff --git a/activejob/test/dummy/config/initializers/session_store.rb b/activejob/test/dummy/config/initializers/session_store.rb deleted file mode 100644 index 70a5a506a9..0000000000 --- a/activejob/test/dummy/config/initializers/session_store.rb +++ /dev/null @@ -1 +0,0 @@ -Rails.application.config.session_store :cookie_store, key: '_dummy_session' diff --git a/activejob/test/dummy/config/routes.rb b/activejob/test/dummy/config/routes.rb deleted file mode 100644 index 1daf9a4121..0000000000 --- a/activejob/test/dummy/config/routes.rb +++ /dev/null @@ -1,2 +0,0 @@ -Rails.application.routes.draw do -end diff --git a/activejob/test/dummy/config/secrets.yml b/activejob/test/dummy/config/secrets.yml deleted file mode 100644 index 7dfacb38ea..0000000000 --- a/activejob/test/dummy/config/secrets.yml +++ /dev/null @@ -1,2 +0,0 @@ -test: - secret_key_base: b83ee5aeada663bc4270a1817d0ca43b2784017cc77dc8afcd60967cc968d4ce30caff9eb682766129e18a4048c4d5ebf14eabf463fc37ad67c18934f4345545 diff --git a/activejob/test/dummy/db/migrate/20140804200445_create_delayed_jobs.rb b/activejob/test/dummy/db/migrate/20140804200445_create_delayed_jobs.rb deleted file mode 100644 index ec0dd93ce1..0000000000 --- a/activejob/test/dummy/db/migrate/20140804200445_create_delayed_jobs.rb +++ /dev/null @@ -1,22 +0,0 @@ -class CreateDelayedJobs < ActiveRecord::Migration - def self.up - create_table :delayed_jobs, :force => true do |table| - table.integer :priority, :default => 0, :null => false # Allows some jobs to jump to the front of the queue - table.integer :attempts, :default => 0, :null => false # Provides for retries, but still fail eventually. - table.text :handler, :null => false # YAML-encoded string of the object that will do work - table.text :last_error # reason for last failure (See Note below) - table.datetime :run_at # When to run. Could be Time.zone.now for immediately, or sometime in the future. - table.datetime :locked_at # Set when a client is working on this object - table.datetime :failed_at # Set when all retries have failed (actually, by default, the record is deleted instead) - table.string :locked_by # Who is working on this object (if locked) - table.string :queue # The name of the queue this job is in - table.timestamps - end - - add_index :delayed_jobs, [:priority, :run_at], :name => 'delayed_jobs_priority' - end - - def self.down - drop_table :delayed_jobs - end -end diff --git a/activejob/test/dummy/db/schema.rb b/activejob/test/dummy/db/schema.rb deleted file mode 100644 index 012a099f9c..0000000000 --- a/activejob/test/dummy/db/schema.rb +++ /dev/null @@ -1,32 +0,0 @@ -# encoding: UTF-8 -# This file is auto-generated from the current state of the database. Instead -# of editing this file, please use the migrations feature of Active Record to -# incrementally modify your database, and then regenerate this schema definition. -# -# Note that this schema.rb definition is the authoritative source for your -# database schema. If you need to create the application database on another -# system, you should be using db:schema:load, not running all the migrations -# from scratch. The latter is a flawed and unsustainable approach (the more migrations -# you'll amass, the slower it'll run and the greater likelihood for issues). -# -# It's strongly recommended that you check this file into your version control system. - -ActiveRecord::Schema.define(version: 20140804200445) do - - create_table "delayed_jobs", force: true do |t| - t.integer "priority", default: 0, null: false - t.integer "attempts", default: 0, null: false - t.text "handler", null: false - t.text "last_error" - t.datetime "run_at" - t.datetime "locked_at" - t.datetime "failed_at" - t.string "locked_by" - t.string "queue" - t.datetime "created_at" - t.datetime "updated_at" - end - - add_index "delayed_jobs", ["priority", "run_at"], name: "delayed_jobs_priority" - -end diff --git a/activejob/test/dummy/db/test.sqlite3 b/activejob/test/dummy/db/test.sqlite3 Binary files differdeleted file mode 100644 index 671e20102e..0000000000 --- a/activejob/test/dummy/db/test.sqlite3 +++ /dev/null diff --git a/activejob/test/dummy/lib/assets/.keep b/activejob/test/dummy/lib/assets/.keep deleted file mode 100644 index e69de29bb2..0000000000 --- a/activejob/test/dummy/lib/assets/.keep +++ /dev/null diff --git a/activejob/test/dummy/log/.keep b/activejob/test/dummy/log/.keep deleted file mode 100644 index e69de29bb2..0000000000 --- a/activejob/test/dummy/log/.keep +++ /dev/null diff --git a/activejob/test/dummy/tmp/.keep b/activejob/test/dummy/tmp/.keep deleted file mode 100644 index e69de29bb2..0000000000 --- a/activejob/test/dummy/tmp/.keep +++ /dev/null diff --git a/activejob/test/helper.rb b/activejob/test/helper.rb index 104dabd861..ad263c05cd 100644 --- a/activejob/test/helper.rb +++ b/activejob/test/helper.rb @@ -6,13 +6,8 @@ $LOAD_PATH << File.dirname(__FILE__) + "/../lib" require 'active_job' adapter = ENV['AJADAPTER'] || 'inline' -puts "Testing#{" integration" if ENV['AJ_INTEGRATION_TESTS']} using #{adapter}" -if ENV['AJ_INTEGRATION_TESTS'] - require 'support/integration/helper' -else - require "adapters/#{adapter}" -end +require "adapters/#{adapter}" require 'active_support/testing/autorun' diff --git a/activejob/test/integration/queuing_test.rb b/activejob/test/integration/queuing_test.rb deleted file mode 100644 index bf6137af4c..0000000000 --- a/activejob/test/integration/queuing_test.rb +++ /dev/null @@ -1,18 +0,0 @@ -require 'helper' -require 'jobs/logging_job' -require 'active_support/core_ext/numeric/time' - - -class QueuingTest < ActiveSupport::TestCase - setup do - - end - - test 'run queued job' do - id = "AJ-#{SecureRandom.uuid}" - TestJob.enqueue id - sleep 2 - assert Dummy::Application.root.join("tmp/#{id}").exist? - end - -end diff --git a/activejob/test/support/integration/adapters/backburner.rb b/activejob/test/support/integration/adapters/backburner.rb deleted file mode 100644 index 7271d50a45..0000000000 --- a/activejob/test/support/integration/adapters/backburner.rb +++ /dev/null @@ -1,15 +0,0 @@ -module BackburnerJobsManager - def clear_jobs - Backburner::Worker.connection.tubes.all.map &:clear - end - - def start_workers - @thread = Thread.new { Backburner.work "active-jobs-default" } - end - - def stop_workers - @thread.kill - end - -end - diff --git a/activejob/test/support/integration/adapters/delayed_job.rb b/activejob/test/support/integration/adapters/delayed_job.rb deleted file mode 100644 index 3e55933438..0000000000 --- a/activejob/test/support/integration/adapters/delayed_job.rb +++ /dev/null @@ -1,14 +0,0 @@ -module DelayedJobJobsManager - def clear_jobs - Delayed::Job.delete_all - end - - def start_workers - @worker = Delayed::Worker.new(quiet: false, sleep_delay: 0.5) - @thread = Thread.new { @worker.start } - end - - def stop_workers - @worker.stop - end -end diff --git a/activejob/test/support/integration/adapters/qu.rb b/activejob/test/support/integration/adapters/qu.rb deleted file mode 100644 index 12d063ea0d..0000000000 --- a/activejob/test/support/integration/adapters/qu.rb +++ /dev/null @@ -1,14 +0,0 @@ -module QuJobsManager - def clear_jobs - Qu.clear "active_jobs_default" - end - - def start_workers - @thread = Thread.new { Qu::Worker.new("active_jobs_default").start } - end - - def stop_workers - @thread.kill - end -end - diff --git a/activejob/test/support/integration/adapters/que.rb b/activejob/test/support/integration/adapters/que.rb deleted file mode 100644 index f15c9af910..0000000000 --- a/activejob/test/support/integration/adapters/que.rb +++ /dev/null @@ -1,19 +0,0 @@ -module QueJobsManager - def clear_jobs - Que.clear! - end - - def start_workers - @thread = Thread.new do - loop do - Que::Job.work("active_jobs_default") - sleep 0.5 - end - end - end - - def stop_workers - @thread.kill - end -end - diff --git a/activejob/test/support/integration/adapters/queue_classic.rb b/activejob/test/support/integration/adapters/queue_classic.rb deleted file mode 100644 index 3b24eca5b9..0000000000 --- a/activejob/test/support/integration/adapters/queue_classic.rb +++ /dev/null @@ -1,21 +0,0 @@ -module QC; WAIT_TIME = 0.5; end - -module QueueClassicJobsManager - def clear_jobs - # disabling this as it locks - # QC::Queue.new("active_jobs_default").delete_all - end - - def start_workers - @pid = fork do - QC::Conn.connection = QC::Conn.connect - worker = QC::Worker.new(q_name: 'active_jobs_default') - worker.start - end - end - - def stop_workers - Process.kill 'HUP', @pid - end -end - diff --git a/activejob/test/support/integration/adapters/resque.rb b/activejob/test/support/integration/adapters/resque.rb deleted file mode 100644 index b9811bd3e1..0000000000 --- a/activejob/test/support/integration/adapters/resque.rb +++ /dev/null @@ -1,18 +0,0 @@ -module ResqueJobsManager - def clear_jobs - Resque.queues.each { |queue_name| Resque.redis.del "queue:#{queue_name}" } - Resque.redis.keys("delayed:*").each { |key| Resque.redis.del "#{key}" } - Resque.redis.del "delayed_queue_schedule" - end - - def start_workers - @thread = Thread.new do - Resque::Worker.new("*").work(0.5) - end - end - - def stop_workers - @thread.kill - end -end - diff --git a/activejob/test/support/integration/adapters/sidekiq.rb b/activejob/test/support/integration/adapters/sidekiq.rb deleted file mode 100644 index d3b7d15614..0000000000 --- a/activejob/test/support/integration/adapters/sidekiq.rb +++ /dev/null @@ -1,19 +0,0 @@ -require 'sidekiq/launcher' -require 'sidekiq/api' - -module SidekiqJobsManager - def clear_jobs - Sidekiq::Queue.new("active_jobs_default").clear - end - - def start_workers - options = {:queues=>["active_jobs_default"], :concurrency=>1, :environment=>"test", :timeout=>8, :daemon=>true, :strict=>true} - @launcher = Sidekiq::Launcher.new(options) - @launcher.run - end - - def stop_workers - @launcher.stop - end -end - diff --git a/activejob/test/support/integration/adapters/sneakers.rb b/activejob/test/support/integration/adapters/sneakers.rb deleted file mode 100644 index 5dcab68515..0000000000 --- a/activejob/test/support/integration/adapters/sneakers.rb +++ /dev/null @@ -1,18 +0,0 @@ -require 'sneakers/runner' - -module SneakersJobsManager - def clear_jobs - end - - def start_workers - cmd = %{cd #{Rails.root.to_s} && (RAILS_ENV=test AJADAPTER=sneakers WORKERS=ActiveJob::QueueAdapters::SneakersAdapter::JobWrapper bundle exec rake --trace sneakers:run)} - `#{cmd}` - while !Rails.root.join("tmp/sneakers.pid").exist? do - sleep 0.5 - end - end - - def stop_workers - Process.kill 'TERM', File.open(Rails.root.join("tmp/sneakers.pid").to_s).read.to_i - end -end diff --git a/activejob/test/support/integration/adapters/sucker_punch.rb b/activejob/test/support/integration/adapters/sucker_punch.rb deleted file mode 100644 index 317f9c80fd..0000000000 --- a/activejob/test/support/integration/adapters/sucker_punch.rb +++ /dev/null @@ -1,5 +0,0 @@ -module SuckerPunchJobsManager - def clear_jobs - end -end - diff --git a/activejob/test/support/integration/helper.rb b/activejob/test/support/integration/helper.rb deleted file mode 100644 index cb94e7cfb5..0000000000 --- a/activejob/test/support/integration/helper.rb +++ /dev/null @@ -1,12 +0,0 @@ -ENV["RAILS_ENV"] = "test" -require File.expand_path("../../../dummy/config/environment.rb", __FILE__) -require "rails/test_help" -Rails.backtrace_cleaner.remove_silencers! - -require_relative 'test_case_helpers' -ActiveSupport::TestCase.send(:include, TestCaseHelpers) - -JobsManager.current_manager.setup -JobsManager.current_manager.start_workers -Minitest.after_run { JobsManager.current_manager.stop_workers } - diff --git a/activejob/test/support/integration/jobs_manager.rb b/activejob/test/support/integration/jobs_manager.rb deleted file mode 100644 index 1da74193b1..0000000000 --- a/activejob/test/support/integration/jobs_manager.rb +++ /dev/null @@ -1,23 +0,0 @@ -class JobsManager - @@managers = {} - attr :adapter_name - - def self.current_manager - @@managers[ENV['AJADAPTER']] ||= new(ENV['AJADAPTER']) - end - - def initialize(adapter_name) - @adapter_name = adapter_name - require_relative "adapters/#{adapter_name}" - extend "#{adapter_name.camelize}JobsManager".constantize - end - - def setup - end - - def start_workers - end - - def stop_workers - end -end diff --git a/activejob/test/support/integration/test_case_helpers.rb b/activejob/test/support/integration/test_case_helpers.rb deleted file mode 100644 index 9a5eea0783..0000000000 --- a/activejob/test/support/integration/test_case_helpers.rb +++ /dev/null @@ -1,30 +0,0 @@ -require 'active_support/concern' -require 'support/integration/jobs_manager' - -module TestCaseHelpers - extend ActiveSupport::Concern - - included do - self.use_transactional_fixtures = false - - setup do - clear_jobs - end - - teardown do - clear_jobs - FileUtils.rm_rf Dir[Dummy::Application.root.join("tmp/AJ-*")] - end - end - - protected - - def jobs_manager - JobsManager.current_manager - end - - def clear_jobs - jobs_manager.clear_jobs - end - -end |