From 63139dd402d694b926b1f32ab4d0a5201a5fe731 Mon Sep 17 00:00:00 2001 From: Simon Maynard Date: Fri, 26 Oct 2018 00:47:28 -0700 Subject: [PATCH 1/6] Wip adding delayed job tests --- features/delayed_job.feature | 28 ++++++ features/fixtures/delayed_job/.dockerignore | 1 - features/fixtures/delayed_job/Dockerfile | 15 ++-- features/fixtures/delayed_job/Gemfile | 4 - features/fixtures/delayed_job/app/.gitignore | 21 +++++ features/fixtures/delayed_job/app/Gemfile | 57 ++++++++++++ features/fixtures/delayed_job/app/README.md | 24 ++++++ features/fixtures/delayed_job/app/Rakefile | 6 ++ .../app/app/assets/config/manifest.js | 3 + .../delayed_job/app/app/assets/images/.keep | 0 .../app/app/assets/javascripts/application.js | 16 ++++ .../app/app/assets/javascripts/cable.js | 13 +++ .../app/app/assets/javascripts/channels/.keep | 0 .../app/assets/stylesheets/application.css | 15 ++++ .../app/channels/application_cable/channel.rb | 4 + .../channels/application_cable/connection.rb | 4 + .../app/controllers/application_controller.rb | 3 + .../app/app/controllers/concerns/.keep | 0 .../app/app/helpers/application_helper.rb | 2 + .../app/app/jobs/application_job.rb | 2 + .../app/app/mailers/application_mailer.rb | 4 + .../app/app/models/application_record.rb | 3 + .../delayed_job/app/app/models/concerns/.keep | 0 .../delayed_job/app/app/models/test_model.rb | 13 +++ .../app/views/layouts/application.html.erb | 14 +++ .../app/app/views/layouts/mailer.html.erb | 13 +++ .../app/app/views/layouts/mailer.text.erb | 1 + features/fixtures/delayed_job/app/config.ru | 5 ++ .../delayed_job/app/config/application.rb | 15 ++++ .../fixtures/delayed_job/app/config/boot.rb | 3 + .../fixtures/delayed_job/app/config/cable.yml | 9 ++ .../delayed_job/app/config/database.yml | 25 ++++++ .../delayed_job/app/config/environment.rb | 5 ++ .../app/config/environments/development.rb | 54 ++++++++++++ .../app/config/environments/production.rb | 86 +++++++++++++++++++ .../app/config/environments/test.rb | 42 +++++++++ .../application_controller_renderer.rb | 8 ++ .../app/config/initializers/assets.rb | 11 +++ .../initializers/backtrace_silencers.rb | 7 ++ .../app/config/initializers/bugsnag.rb | 3 + .../config/initializers/cookies_serializer.rb | 5 ++ .../initializers/filter_parameter_logging.rb | 4 + .../app/config/initializers/inflections.rb | 16 ++++ .../app/config/initializers/mime_types.rb | 4 + .../initializers/new_framework_defaults.rb | 26 ++++++ .../app/config/initializers/session_store.rb | 3 + .../config/initializers/wrap_parameters.rb | 14 +++ .../delayed_job/app/config/locales/en.yml | 23 +++++ .../fixtures/delayed_job/app/config/puma.rb | 47 ++++++++++ .../fixtures/delayed_job/app/config/routes.rb | 3 + .../delayed_job/app/config/secrets.yml | 22 +++++ .../fixtures/delayed_job/app/config/spring.rb | 6 ++ .../20181024232549_create_delayed_jobs.rb | 22 +++++ .../20181024232817_create_test_models.rb | 8 ++ .../fixtures/delayed_job/app/db/schema.rb | 30 +++++++ features/fixtures/delayed_job/app/db/seeds.rb | 7 ++ .../fixtures/delayed_job/app/lib/assets/.keep | 0 .../fixtures/delayed_job/app/lib/tasks/.keep | 0 features/fixtures/delayed_job/app/log/.keep | 0 .../fixtures/delayed_job/app/public/404.html | 67 +++++++++++++++ .../fixtures/delayed_job/app/public/422.html | 67 +++++++++++++++ .../fixtures/delayed_job/app/public/500.html | 66 ++++++++++++++ .../public/apple-touch-icon-precomposed.png | 0 .../app/public/apple-touch-icon.png | 0 .../delayed_job/app/public/favicon.ico | 0 .../delayed_job/app/public/robots.txt | 5 ++ .../delayed_job/app/test/controllers/.keep | 0 .../delayed_job/app/test/fixtures/.keep | 0 .../delayed_job/app/test/fixtures/files/.keep | 0 .../app/test/fixtures/test_models.yml | 11 +++ .../delayed_job/app/test/helpers/.keep | 0 .../delayed_job/app/test/integration/.keep | 0 .../delayed_job/app/test/mailers/.keep | 0 .../delayed_job/app/test/models/.keep | 0 .../app/test/models/test_model_test.rb | 7 ++ .../delayed_job/app/test/test_helper.rb | 10 +++ features/fixtures/delayed_job/app/tmp/.keep | 0 features/fixtures/docker-compose.yml | 4 +- features/steps/ruby_notifier_steps.rb | 9 ++ 79 files changed, 1012 insertions(+), 13 deletions(-) create mode 100644 features/delayed_job.feature delete mode 100644 features/fixtures/delayed_job/.dockerignore delete mode 100644 features/fixtures/delayed_job/Gemfile create mode 100644 features/fixtures/delayed_job/app/.gitignore create mode 100644 features/fixtures/delayed_job/app/Gemfile create mode 100644 features/fixtures/delayed_job/app/README.md create mode 100644 features/fixtures/delayed_job/app/Rakefile create mode 100644 features/fixtures/delayed_job/app/app/assets/config/manifest.js create mode 100644 features/fixtures/delayed_job/app/app/assets/images/.keep create mode 100644 features/fixtures/delayed_job/app/app/assets/javascripts/application.js create mode 100644 features/fixtures/delayed_job/app/app/assets/javascripts/cable.js create mode 100644 features/fixtures/delayed_job/app/app/assets/javascripts/channels/.keep create mode 100644 features/fixtures/delayed_job/app/app/assets/stylesheets/application.css create mode 100644 features/fixtures/delayed_job/app/app/channels/application_cable/channel.rb create mode 100644 features/fixtures/delayed_job/app/app/channels/application_cable/connection.rb create mode 100644 features/fixtures/delayed_job/app/app/controllers/application_controller.rb create mode 100644 features/fixtures/delayed_job/app/app/controllers/concerns/.keep create mode 100644 features/fixtures/delayed_job/app/app/helpers/application_helper.rb create mode 100644 features/fixtures/delayed_job/app/app/jobs/application_job.rb create mode 100644 features/fixtures/delayed_job/app/app/mailers/application_mailer.rb create mode 100644 features/fixtures/delayed_job/app/app/models/application_record.rb create mode 100644 features/fixtures/delayed_job/app/app/models/concerns/.keep create mode 100644 features/fixtures/delayed_job/app/app/models/test_model.rb create mode 100644 features/fixtures/delayed_job/app/app/views/layouts/application.html.erb create mode 100644 features/fixtures/delayed_job/app/app/views/layouts/mailer.html.erb create mode 100644 features/fixtures/delayed_job/app/app/views/layouts/mailer.text.erb create mode 100644 features/fixtures/delayed_job/app/config.ru create mode 100644 features/fixtures/delayed_job/app/config/application.rb create mode 100644 features/fixtures/delayed_job/app/config/boot.rb create mode 100644 features/fixtures/delayed_job/app/config/cable.yml create mode 100644 features/fixtures/delayed_job/app/config/database.yml create mode 100644 features/fixtures/delayed_job/app/config/environment.rb create mode 100644 features/fixtures/delayed_job/app/config/environments/development.rb create mode 100644 features/fixtures/delayed_job/app/config/environments/production.rb create mode 100644 features/fixtures/delayed_job/app/config/environments/test.rb create mode 100644 features/fixtures/delayed_job/app/config/initializers/application_controller_renderer.rb create mode 100644 features/fixtures/delayed_job/app/config/initializers/assets.rb create mode 100644 features/fixtures/delayed_job/app/config/initializers/backtrace_silencers.rb create mode 100644 features/fixtures/delayed_job/app/config/initializers/bugsnag.rb create mode 100644 features/fixtures/delayed_job/app/config/initializers/cookies_serializer.rb create mode 100644 features/fixtures/delayed_job/app/config/initializers/filter_parameter_logging.rb create mode 100644 features/fixtures/delayed_job/app/config/initializers/inflections.rb create mode 100644 features/fixtures/delayed_job/app/config/initializers/mime_types.rb create mode 100644 features/fixtures/delayed_job/app/config/initializers/new_framework_defaults.rb create mode 100644 features/fixtures/delayed_job/app/config/initializers/session_store.rb create mode 100644 features/fixtures/delayed_job/app/config/initializers/wrap_parameters.rb create mode 100644 features/fixtures/delayed_job/app/config/locales/en.yml create mode 100644 features/fixtures/delayed_job/app/config/puma.rb create mode 100644 features/fixtures/delayed_job/app/config/routes.rb create mode 100644 features/fixtures/delayed_job/app/config/secrets.yml create mode 100644 features/fixtures/delayed_job/app/config/spring.rb create mode 100644 features/fixtures/delayed_job/app/db/migrate/20181024232549_create_delayed_jobs.rb create mode 100644 features/fixtures/delayed_job/app/db/migrate/20181024232817_create_test_models.rb create mode 100644 features/fixtures/delayed_job/app/db/schema.rb create mode 100644 features/fixtures/delayed_job/app/db/seeds.rb create mode 100644 features/fixtures/delayed_job/app/lib/assets/.keep create mode 100644 features/fixtures/delayed_job/app/lib/tasks/.keep create mode 100644 features/fixtures/delayed_job/app/log/.keep create mode 100644 features/fixtures/delayed_job/app/public/404.html create mode 100644 features/fixtures/delayed_job/app/public/422.html create mode 100644 features/fixtures/delayed_job/app/public/500.html create mode 100644 features/fixtures/delayed_job/app/public/apple-touch-icon-precomposed.png create mode 100644 features/fixtures/delayed_job/app/public/apple-touch-icon.png create mode 100644 features/fixtures/delayed_job/app/public/favicon.ico create mode 100644 features/fixtures/delayed_job/app/public/robots.txt create mode 100644 features/fixtures/delayed_job/app/test/controllers/.keep create mode 100644 features/fixtures/delayed_job/app/test/fixtures/.keep create mode 100644 features/fixtures/delayed_job/app/test/fixtures/files/.keep create mode 100644 features/fixtures/delayed_job/app/test/fixtures/test_models.yml create mode 100644 features/fixtures/delayed_job/app/test/helpers/.keep create mode 100644 features/fixtures/delayed_job/app/test/integration/.keep create mode 100644 features/fixtures/delayed_job/app/test/mailers/.keep create mode 100644 features/fixtures/delayed_job/app/test/models/.keep create mode 100644 features/fixtures/delayed_job/app/test/models/test_model_test.rb create mode 100644 features/fixtures/delayed_job/app/test/test_helper.rb create mode 100644 features/fixtures/delayed_job/app/tmp/.keep diff --git a/features/delayed_job.feature b/features/delayed_job.feature new file mode 100644 index 000000000..8ca17ce09 --- /dev/null +++ b/features/delayed_job.feature @@ -0,0 +1,28 @@ +Feature: Bugsnag detects errors in Delayed job workers + +Background: + Given I set environment variable "BUGSNAG_API_KEY" to "a35a2a72bd230ac0aa0f52715bbdc6aa" + And I set environment variable "MAZE_API_KEY" to "a35a2a72bd230ac0aa0f52715bbdc6aa" + And I configure the bugsnag endpoint + And I generate the gem and put it in "delayed_job" + +Scenario: An unhandled RuntimeError sends a report + Given I set environment variable "RUBY_VERSION" to "2.5" + And I start the service "delayed_job" + And I run the command "bundle exec rails runner 'TestModel.delay.fail'" on the service "delayed_job" + And I wait for 1 seconds + Then I should receive a request + And the request used the Ruby notifier + And the request used payload v4 headers + And the request contained the api key "a35a2a72bd230ac0aa0f52715bbdc6aa" + And the event "unhandled" is true + And the event "severity" is "error" + And the event "context" is null + And the event "severityReason.type" is "unhandledExceptionMiddleware" + And the event "severityReason.attributes.framework" is "delayed_job" + And the exception "errorClass" equals "RuntimeError" + And the "file" of stack frame 0 equals "/usr/src/app.rb" + And the "lineNumber" of stack frame 0 equals 33 + And the payload field "events.0.metaData.sidekiq" matches the JSON fixture in "features/fixtures/sidekiq/payloads/unhandled_metadata_ca_.json" + And the event "metaData.sidekiq.msg.created_at" is a parsable timestamp in seconds + And the event "metaData.sidekiq.msg.enqueued_at" is a parsable timestamp in seconds diff --git a/features/fixtures/delayed_job/.dockerignore b/features/fixtures/delayed_job/.dockerignore deleted file mode 100644 index b844b143d..000000000 --- a/features/fixtures/delayed_job/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -Gemfile.lock diff --git a/features/fixtures/delayed_job/Dockerfile b/features/fixtures/delayed_job/Dockerfile index f775c10e0..d9714fbe1 100644 --- a/features/fixtures/delayed_job/Dockerfile +++ b/features/fixtures/delayed_job/Dockerfile @@ -1,12 +1,17 @@ ARG ruby_version FROM ruby:$ruby_version -RUN mkdir -p /usr/src/app -WORKDIR /usr/src/app +WORKDIR /bugsnag +COPY *.gem ./ +RUN gem unpack bugsnag*.gem /bugsnag -COPY Gemfile /usr/src/app/ +WORKDIR /usr/src/app +COPY app/Gemfile /usr/src/app/ RUN bundle install -COPY . /usr/src/app +COPY app/ /usr/src/app + +RUN bundle exec rails generate delayed_job:active_record +RUN bundle exec rake db:migrate -CMD ["bundle", "exec", "rails", "s", "-b", "0.0.0.0"] +CMD ["bundle", "exec", "rake", "jobs:work"] diff --git a/features/fixtures/delayed_job/Gemfile b/features/fixtures/delayed_job/Gemfile deleted file mode 100644 index f4ce89ea0..000000000 --- a/features/fixtures/delayed_job/Gemfile +++ /dev/null @@ -1,4 +0,0 @@ -source 'https://rubygems.org' - -gem 'bugsnag' -gem 'delayed_job' diff --git a/features/fixtures/delayed_job/app/.gitignore b/features/fixtures/delayed_job/app/.gitignore new file mode 100644 index 000000000..bab620de0 --- /dev/null +++ b/features/fixtures/delayed_job/app/.gitignore @@ -0,0 +1,21 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore the default SQLite database. +/db/*.sqlite3 +/db/*.sqlite3-journal + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +# Ignore Byebug command history file. +.byebug_history diff --git a/features/fixtures/delayed_job/app/Gemfile b/features/fixtures/delayed_job/app/Gemfile new file mode 100644 index 000000000..ba901939d --- /dev/null +++ b/features/fixtures/delayed_job/app/Gemfile @@ -0,0 +1,57 @@ +source 'https://rubygems.org' + +git_source(:github) do |repo_name| + repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/") + "https://github.com/#{repo_name}.git" +end + +gem 'bugsnag', path: '/bugsnag' +gem 'delayed_job' +gem 'delayed_job_active_record' +gem 'therubyracer' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.0.7' +# Use sqlite3 as the database for Active Record +gem 'sqlite3' +# Use Puma as the app server +gem 'puma', '~> 3.0' +# Use SCSS for stylesheets +gem 'sass-rails', '~> 5.0' +# Use Uglifier as compressor for JavaScript assets +gem 'uglifier', '>= 1.3.0' +# Use CoffeeScript for .coffee assets and views +gem 'coffee-rails', '~> 4.2' +# See https://github.com/rails/execjs#readme for more supported runtimes +# gem 'therubyracer', platforms: :ruby + +# Use jquery as the JavaScript library +gem 'jquery-rails' +# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks +gem 'turbolinks', '~> 5' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 3.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platform: :mri +end + +group :development do + # Access an IRB console on exception pages or by using <%= console %> anywhere in the code. + gem 'web-console', '>= 3.3.0' + gem 'listen', '~> 3.0.5' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] diff --git a/features/fixtures/delayed_job/app/README.md b/features/fixtures/delayed_job/app/README.md new file mode 100644 index 000000000..7db80e4ca --- /dev/null +++ b/features/fixtures/delayed_job/app/README.md @@ -0,0 +1,24 @@ +# README + +This README would normally document whatever steps are necessary to get the +application up and running. + +Things you may want to cover: + +* Ruby version + +* System dependencies + +* Configuration + +* Database creation + +* Database initialization + +* How to run the test suite + +* Services (job queues, cache servers, search engines, etc.) + +* Deployment instructions + +* ... diff --git a/features/fixtures/delayed_job/app/Rakefile b/features/fixtures/delayed_job/app/Rakefile new file mode 100644 index 000000000..e85f91391 --- /dev/null +++ b/features/fixtures/delayed_job/app/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require_relative 'config/application' + +Rails.application.load_tasks diff --git a/features/fixtures/delayed_job/app/app/assets/config/manifest.js b/features/fixtures/delayed_job/app/app/assets/config/manifest.js new file mode 100644 index 000000000..b16e53d6d --- /dev/null +++ b/features/fixtures/delayed_job/app/app/assets/config/manifest.js @@ -0,0 +1,3 @@ +//= link_tree ../images +//= link_directory ../javascripts .js +//= link_directory ../stylesheets .css diff --git a/features/fixtures/delayed_job/app/app/assets/images/.keep b/features/fixtures/delayed_job/app/app/assets/images/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/features/fixtures/delayed_job/app/app/assets/javascripts/application.js b/features/fixtures/delayed_job/app/app/assets/javascripts/application.js new file mode 100644 index 000000000..b12018d09 --- /dev/null +++ b/features/fixtures/delayed_job/app/app/assets/javascripts/application.js @@ -0,0 +1,16 @@ +// This is a manifest file that'll be compiled into application.js, which will include all the files +// listed below. +// +// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts, +// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path. +// +// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the +// compiled file. JavaScript code in this file should be added after the last require_* statement. +// +// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details +// about supported directives. +// +//= require jquery +//= require jquery_ujs +//= require turbolinks +//= require_tree . diff --git a/features/fixtures/delayed_job/app/app/assets/javascripts/cable.js b/features/fixtures/delayed_job/app/app/assets/javascripts/cable.js new file mode 100644 index 000000000..71ee1e66d --- /dev/null +++ b/features/fixtures/delayed_job/app/app/assets/javascripts/cable.js @@ -0,0 +1,13 @@ +// Action Cable provides the framework to deal with WebSockets in Rails. +// You can generate new channels where WebSocket features live using the rails generate channel command. +// +//= require action_cable +//= require_self +//= require_tree ./channels + +(function() { + this.App || (this.App = {}); + + App.cable = ActionCable.createConsumer(); + +}).call(this); diff --git a/features/fixtures/delayed_job/app/app/assets/javascripts/channels/.keep b/features/fixtures/delayed_job/app/app/assets/javascripts/channels/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/features/fixtures/delayed_job/app/app/assets/stylesheets/application.css b/features/fixtures/delayed_job/app/app/assets/stylesheets/application.css new file mode 100644 index 000000000..0ebd7fe82 --- /dev/null +++ b/features/fixtures/delayed_job/app/app/assets/stylesheets/application.css @@ -0,0 +1,15 @@ +/* + * This is a manifest file that'll be compiled into application.css, which will include all the files + * listed below. + * + * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets, + * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path. + * + * You're free to add application-wide styles to this file and they'll appear at the bottom of the + * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS + * files in this directory. Styles in this file should be added after the last require_* statement. + * It is generally better to create a new file per style scope. + * + *= require_tree . + *= require_self + */ diff --git a/features/fixtures/delayed_job/app/app/channels/application_cable/channel.rb b/features/fixtures/delayed_job/app/app/channels/application_cable/channel.rb new file mode 100644 index 000000000..d67269728 --- /dev/null +++ b/features/fixtures/delayed_job/app/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/features/fixtures/delayed_job/app/app/channels/application_cable/connection.rb b/features/fixtures/delayed_job/app/app/channels/application_cable/connection.rb new file mode 100644 index 000000000..0ff5442f4 --- /dev/null +++ b/features/fixtures/delayed_job/app/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/features/fixtures/delayed_job/app/app/controllers/application_controller.rb b/features/fixtures/delayed_job/app/app/controllers/application_controller.rb new file mode 100644 index 000000000..1c07694e9 --- /dev/null +++ b/features/fixtures/delayed_job/app/app/controllers/application_controller.rb @@ -0,0 +1,3 @@ +class ApplicationController < ActionController::Base + protect_from_forgery with: :exception +end diff --git a/features/fixtures/delayed_job/app/app/controllers/concerns/.keep b/features/fixtures/delayed_job/app/app/controllers/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/features/fixtures/delayed_job/app/app/helpers/application_helper.rb b/features/fixtures/delayed_job/app/app/helpers/application_helper.rb new file mode 100644 index 000000000..de6be7945 --- /dev/null +++ b/features/fixtures/delayed_job/app/app/helpers/application_helper.rb @@ -0,0 +1,2 @@ +module ApplicationHelper +end diff --git a/features/fixtures/delayed_job/app/app/jobs/application_job.rb b/features/fixtures/delayed_job/app/app/jobs/application_job.rb new file mode 100644 index 000000000..a009ace51 --- /dev/null +++ b/features/fixtures/delayed_job/app/app/jobs/application_job.rb @@ -0,0 +1,2 @@ +class ApplicationJob < ActiveJob::Base +end diff --git a/features/fixtures/delayed_job/app/app/mailers/application_mailer.rb b/features/fixtures/delayed_job/app/app/mailers/application_mailer.rb new file mode 100644 index 000000000..286b2239d --- /dev/null +++ b/features/fixtures/delayed_job/app/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/features/fixtures/delayed_job/app/app/models/application_record.rb b/features/fixtures/delayed_job/app/app/models/application_record.rb new file mode 100644 index 000000000..10a4cba84 --- /dev/null +++ b/features/fixtures/delayed_job/app/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/features/fixtures/delayed_job/app/app/models/concerns/.keep b/features/fixtures/delayed_job/app/app/models/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/features/fixtures/delayed_job/app/app/models/test_model.rb b/features/fixtures/delayed_job/app/app/models/test_model.rb new file mode 100644 index 000000000..c77dee930 --- /dev/null +++ b/features/fixtures/delayed_job/app/app/models/test_model.rb @@ -0,0 +1,13 @@ +class TestModel < ApplicationRecord + def self.print + puts "yo" + end + + def self.fail + raise "uh oh" + end + + def self.fail_with_args(a) + raise "uh oh" + end +end diff --git a/features/fixtures/delayed_job/app/app/views/layouts/application.html.erb b/features/fixtures/delayed_job/app/app/views/layouts/application.html.erb new file mode 100644 index 000000000..1539732f8 --- /dev/null +++ b/features/fixtures/delayed_job/app/app/views/layouts/application.html.erb @@ -0,0 +1,14 @@ + + + + App + <%= csrf_meta_tags %> + + <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> + <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> + + + + <%= yield %> + + diff --git a/features/fixtures/delayed_job/app/app/views/layouts/mailer.html.erb b/features/fixtures/delayed_job/app/app/views/layouts/mailer.html.erb new file mode 100644 index 000000000..cbd34d2e9 --- /dev/null +++ b/features/fixtures/delayed_job/app/app/views/layouts/mailer.html.erb @@ -0,0 +1,13 @@ + + + + + + + + + <%= yield %> + + diff --git a/features/fixtures/delayed_job/app/app/views/layouts/mailer.text.erb b/features/fixtures/delayed_job/app/app/views/layouts/mailer.text.erb new file mode 100644 index 000000000..37f0bddbd --- /dev/null +++ b/features/fixtures/delayed_job/app/app/views/layouts/mailer.text.erb @@ -0,0 +1 @@ +<%= yield %> diff --git a/features/fixtures/delayed_job/app/config.ru b/features/fixtures/delayed_job/app/config.ru new file mode 100644 index 000000000..f7ba0b527 --- /dev/null +++ b/features/fixtures/delayed_job/app/config.ru @@ -0,0 +1,5 @@ +# This file is used by Rack-based servers to start the application. + +require_relative 'config/environment' + +run Rails.application diff --git a/features/fixtures/delayed_job/app/config/application.rb b/features/fixtures/delayed_job/app/config/application.rb new file mode 100644 index 000000000..7e42acd4d --- /dev/null +++ b/features/fixtures/delayed_job/app/config/application.rb @@ -0,0 +1,15 @@ +require_relative 'boot' + +require 'rails/all' + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module App + class Application < Rails::Application + # Settings in config/environments/* take precedence over those specified here. + # Application configuration should go into files in config/initializers + # -- all .rb files in that directory are automatically loaded. + end +end diff --git a/features/fixtures/delayed_job/app/config/boot.rb b/features/fixtures/delayed_job/app/config/boot.rb new file mode 100644 index 000000000..30f5120df --- /dev/null +++ b/features/fixtures/delayed_job/app/config/boot.rb @@ -0,0 +1,3 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. diff --git a/features/fixtures/delayed_job/app/config/cable.yml b/features/fixtures/delayed_job/app/config/cable.yml new file mode 100644 index 000000000..0bbde6f74 --- /dev/null +++ b/features/fixtures/delayed_job/app/config/cable.yml @@ -0,0 +1,9 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: redis://localhost:6379/1 diff --git a/features/fixtures/delayed_job/app/config/database.yml b/features/fixtures/delayed_job/app/config/database.yml new file mode 100644 index 000000000..1c1a37ca8 --- /dev/null +++ b/features/fixtures/delayed_job/app/config/database.yml @@ -0,0 +1,25 @@ +# SQLite version 3.x +# gem install sqlite3 +# +# Ensure the SQLite 3 gem is defined in your Gemfile +# gem 'sqlite3' +# +default: &default + adapter: sqlite3 + pool: 5 + timeout: 5000 + +development: + <<: *default + database: db/development.sqlite3 + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: db/test.sqlite3 + +production: + <<: *default + database: db/production.sqlite3 diff --git a/features/fixtures/delayed_job/app/config/environment.rb b/features/fixtures/delayed_job/app/config/environment.rb new file mode 100644 index 000000000..426333bb4 --- /dev/null +++ b/features/fixtures/delayed_job/app/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/features/fixtures/delayed_job/app/config/environments/development.rb b/features/fixtures/delayed_job/app/config/environments/development.rb new file mode 100644 index 000000000..6f7197045 --- /dev/null +++ b/features/fixtures/delayed_job/app/config/environments/development.rb @@ -0,0 +1,54 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + if Rails.root.join('tmp/caching-dev.txt').exist? + config.action_controller.perform_caching = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => 'public, max-age=172800' + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Debug mode disables concatenation and preprocessing of assets. + # This option may cause significant delays in view rendering with a large + # number of complex assets. + config.assets.debug = true + + # Suppress logger output for asset requests. + config.assets.quiet = true + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/features/fixtures/delayed_job/app/config/environments/production.rb b/features/fixtures/delayed_job/app/config/environments/production.rb new file mode 100644 index 000000000..37b0cc052 --- /dev/null +++ b/features/fixtures/delayed_job/app/config/environments/production.rb @@ -0,0 +1,86 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + config.action_controller.perform_caching = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Compress JavaScripts and CSS. + config.assets.js_compressor = :uglifier + # config.assets.css_compressor = :sass + + # Do not fallback to assets pipeline if a precompiled asset is missed. + config.assets.compile = false + + # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Mount Action Cable outside main process or domain + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment) + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "app_#{Rails.env}" + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false +end diff --git a/features/fixtures/delayed_job/app/config/environments/test.rb b/features/fixtures/delayed_job/app/config/environments/test.rb new file mode 100644 index 000000000..30587ef6d --- /dev/null +++ b/features/fixtures/delayed_job/app/config/environments/test.rb @@ -0,0 +1,42 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => 'public, max-age=3600' + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/features/fixtures/delayed_job/app/config/initializers/application_controller_renderer.rb b/features/fixtures/delayed_job/app/config/initializers/application_controller_renderer.rb new file mode 100644 index 000000000..89d2efab2 --- /dev/null +++ b/features/fixtures/delayed_job/app/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/features/fixtures/delayed_job/app/config/initializers/assets.rb b/features/fixtures/delayed_job/app/config/initializers/assets.rb new file mode 100644 index 000000000..01ef3e663 --- /dev/null +++ b/features/fixtures/delayed_job/app/config/initializers/assets.rb @@ -0,0 +1,11 @@ +# Be sure to restart your server when you modify this file. + +# Version of your assets, change this if you want to expire all your assets. +Rails.application.config.assets.version = '1.0' + +# Add additional assets to the asset load path +# Rails.application.config.assets.paths << Emoji.images_path + +# Precompile additional assets. +# application.js, application.css, and all non-JS/CSS in app/assets folder are already added. +# Rails.application.config.assets.precompile += %w( search.js ) diff --git a/features/fixtures/delayed_job/app/config/initializers/backtrace_silencers.rb b/features/fixtures/delayed_job/app/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /dev/null +++ b/features/fixtures/delayed_job/app/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/features/fixtures/delayed_job/app/config/initializers/bugsnag.rb b/features/fixtures/delayed_job/app/config/initializers/bugsnag.rb new file mode 100644 index 000000000..c2aa28bc9 --- /dev/null +++ b/features/fixtures/delayed_job/app/config/initializers/bugsnag.rb @@ -0,0 +1,3 @@ +Bugsnag.configure do |config| + config.api_key = "0a336f52d5bc59451e518f3e682209c7" +end diff --git a/features/fixtures/delayed_job/app/config/initializers/cookies_serializer.rb b/features/fixtures/delayed_job/app/config/initializers/cookies_serializer.rb new file mode 100644 index 000000000..5a6a32d37 --- /dev/null +++ b/features/fixtures/delayed_job/app/config/initializers/cookies_serializer.rb @@ -0,0 +1,5 @@ +# Be sure to restart your server when you modify this file. + +# Specify a serializer for the signed and encrypted cookie jars. +# Valid options are :json, :marshal, and :hybrid. +Rails.application.config.action_dispatch.cookies_serializer = :json diff --git a/features/fixtures/delayed_job/app/config/initializers/filter_parameter_logging.rb b/features/fixtures/delayed_job/app/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/features/fixtures/delayed_job/app/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/features/fixtures/delayed_job/app/config/initializers/inflections.rb b/features/fixtures/delayed_job/app/config/initializers/inflections.rb new file mode 100644 index 000000000..ac033bf9d --- /dev/null +++ b/features/fixtures/delayed_job/app/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/features/fixtures/delayed_job/app/config/initializers/mime_types.rb b/features/fixtures/delayed_job/app/config/initializers/mime_types.rb new file mode 100644 index 000000000..dc1899682 --- /dev/null +++ b/features/fixtures/delayed_job/app/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/features/fixtures/delayed_job/app/config/initializers/new_framework_defaults.rb b/features/fixtures/delayed_job/app/config/initializers/new_framework_defaults.rb new file mode 100644 index 000000000..dd236b5fe --- /dev/null +++ b/features/fixtures/delayed_job/app/config/initializers/new_framework_defaults.rb @@ -0,0 +1,26 @@ +# Be sure to restart your server when you modify this file. +# +# This file contains migration options to ease your Rails 5.0 upgrade. +# +# Read the Guide for Upgrading Ruby on Rails for more info on each option. + +Rails.application.config.action_controller.raise_on_unfiltered_parameters = true + +# Enable per-form CSRF tokens. Previous versions had false. +Rails.application.config.action_controller.per_form_csrf_tokens = true + +# Enable origin-checking CSRF mitigation. Previous versions had false. +Rails.application.config.action_controller.forgery_protection_origin_check = true + +# Make Ruby 2.4 preserve the timezone of the receiver when calling `to_time`. +# Previous versions had false. +ActiveSupport.to_time_preserves_timezone = true + +# Require `belongs_to` associations by default. Previous versions had false. +Rails.application.config.active_record.belongs_to_required_by_default = true + +# Do not halt callback chains when a callback returns false. Previous versions had true. +ActiveSupport.halt_callback_chains_on_return_false = false + +# Configure SSL options to enable HSTS with subdomains. Previous versions had false. +Rails.application.config.ssl_options = { hsts: { subdomains: true } } diff --git a/features/fixtures/delayed_job/app/config/initializers/session_store.rb b/features/fixtures/delayed_job/app/config/initializers/session_store.rb new file mode 100644 index 000000000..878cce2be --- /dev/null +++ b/features/fixtures/delayed_job/app/config/initializers/session_store.rb @@ -0,0 +1,3 @@ +# Be sure to restart your server when you modify this file. + +Rails.application.config.session_store :cookie_store, key: '_app_session' diff --git a/features/fixtures/delayed_job/app/config/initializers/wrap_parameters.rb b/features/fixtures/delayed_job/app/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..bbfc3961b --- /dev/null +++ b/features/fixtures/delayed_job/app/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/features/fixtures/delayed_job/app/config/locales/en.yml b/features/fixtures/delayed_job/app/config/locales/en.yml new file mode 100644 index 000000000..065395716 --- /dev/null +++ b/features/fixtures/delayed_job/app/config/locales/en.yml @@ -0,0 +1,23 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/features/fixtures/delayed_job/app/config/puma.rb b/features/fixtures/delayed_job/app/config/puma.rb new file mode 100644 index 000000000..c7f311f81 --- /dev/null +++ b/features/fixtures/delayed_job/app/config/puma.rb @@ -0,0 +1,47 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum, this matches the default thread size of Active Record. +# +threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }.to_i +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests, default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. If you use this option +# you need to make sure to reconnect any threads in the `on_worker_boot` +# block. +# +# preload_app! + +# The code in the `on_worker_boot` will be called if you are using +# clustered mode by specifying a number of `workers`. After each worker +# process is booted this block will be run, if you are using `preload_app!` +# option you will want to use this block to reconnect to any threads +# or connections that may have been created at application boot, Ruby +# cannot share connections between processes. +# +# on_worker_boot do +# ActiveRecord::Base.establish_connection if defined?(ActiveRecord) +# end + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/features/fixtures/delayed_job/app/config/routes.rb b/features/fixtures/delayed_job/app/config/routes.rb new file mode 100644 index 000000000..787824f88 --- /dev/null +++ b/features/fixtures/delayed_job/app/config/routes.rb @@ -0,0 +1,3 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html +end diff --git a/features/fixtures/delayed_job/app/config/secrets.yml b/features/fixtures/delayed_job/app/config/secrets.yml new file mode 100644 index 000000000..7d01918eb --- /dev/null +++ b/features/fixtures/delayed_job/app/config/secrets.yml @@ -0,0 +1,22 @@ +# Be sure to restart your server when you modify this file. + +# Your secret key is used for verifying the integrity of signed cookies. +# If you change this key, all old signed cookies will become invalid! + +# Make sure the secret is at least 30 characters and all random, +# no regular words or you'll be exposed to dictionary attacks. +# You can use `rails secret` to generate a secure secret key. + +# Make sure the secrets in this file are kept private +# if you're sharing your code publicly. + +development: + secret_key_base: 5bbdeedb5f00f9af930e144daef68828cbed84586a9e59880c0865e1759974a1b16f8f568d59da1e6d2891e40c06c9cdda35a897ab9e87048388b661c1b861d3 + +test: + secret_key_base: 124f3db03c0ca01dc5e19e50e7993b7305dd05841a62c5c54886204f30679a96e514ce9aae9ef17b291510efc87de8d207f7511931e4f80b5f6e06160a74ef6e + +# Do not keep production secrets in the repository, +# instead read values from the environment. +production: + secret_key_base: <%= ENV["SECRET_KEY_BASE"] %> diff --git a/features/fixtures/delayed_job/app/config/spring.rb b/features/fixtures/delayed_job/app/config/spring.rb new file mode 100644 index 000000000..c9119b40c --- /dev/null +++ b/features/fixtures/delayed_job/app/config/spring.rb @@ -0,0 +1,6 @@ +%w( + .ruby-version + .rbenv-vars + tmp/restart.txt + tmp/caching-dev.txt +).each { |path| Spring.watch(path) } diff --git a/features/fixtures/delayed_job/app/db/migrate/20181024232549_create_delayed_jobs.rb b/features/fixtures/delayed_job/app/db/migrate/20181024232549_create_delayed_jobs.rb new file mode 100644 index 000000000..130a8d570 --- /dev/null +++ b/features/fixtures/delayed_job/app/db/migrate/20181024232549_create_delayed_jobs.rb @@ -0,0 +1,22 @@ +class CreateDelayedJobs < ActiveRecord::Migration[5.0] + 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 null: true + 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/features/fixtures/delayed_job/app/db/migrate/20181024232817_create_test_models.rb b/features/fixtures/delayed_job/app/db/migrate/20181024232817_create_test_models.rb new file mode 100644 index 000000000..e5388172e --- /dev/null +++ b/features/fixtures/delayed_job/app/db/migrate/20181024232817_create_test_models.rb @@ -0,0 +1,8 @@ +class CreateTestModels < ActiveRecord::Migration[5.0] + def change + create_table :test_models do |t| + + t.timestamps + end + end +end diff --git a/features/fixtures/delayed_job/app/db/schema.rb b/features/fixtures/delayed_job/app/db/schema.rb new file mode 100644 index 000000000..f3b20a75a --- /dev/null +++ b/features/fixtures/delayed_job/app/db/schema.rb @@ -0,0 +1,30 @@ +# 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: 20181024232549) do + + create_table "delayed_jobs", force: :cascade 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" + t.index ["priority", "run_at"], name: "delayed_jobs_priority" + end + +end diff --git a/features/fixtures/delayed_job/app/db/seeds.rb b/features/fixtures/delayed_job/app/db/seeds.rb new file mode 100644 index 000000000..1beea2acc --- /dev/null +++ b/features/fixtures/delayed_job/app/db/seeds.rb @@ -0,0 +1,7 @@ +# This file should contain all the record creation needed to seed the database with its default values. +# The data can then be loaded with the rails db:seed command (or created alongside the database with db:setup). +# +# Examples: +# +# movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }]) +# Character.create(name: 'Luke', movie: movies.first) diff --git a/features/fixtures/delayed_job/app/lib/assets/.keep b/features/fixtures/delayed_job/app/lib/assets/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/features/fixtures/delayed_job/app/lib/tasks/.keep b/features/fixtures/delayed_job/app/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/features/fixtures/delayed_job/app/log/.keep b/features/fixtures/delayed_job/app/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/features/fixtures/delayed_job/app/public/404.html b/features/fixtures/delayed_job/app/public/404.html new file mode 100644 index 000000000..2be3af26f --- /dev/null +++ b/features/fixtures/delayed_job/app/public/404.html @@ -0,0 +1,67 @@ + + + + The page you were looking for doesn't exist (404) + + + + + + +
+
+

The page you were looking for doesn't exist.

+

You may have mistyped the address or the page may have moved.

+
+

If you are the application owner check the logs for more information.

+
+ + diff --git a/features/fixtures/delayed_job/app/public/422.html b/features/fixtures/delayed_job/app/public/422.html new file mode 100644 index 000000000..c08eac0d1 --- /dev/null +++ b/features/fixtures/delayed_job/app/public/422.html @@ -0,0 +1,67 @@ + + + + The change you wanted was rejected (422) + + + + + + +
+
+

The change you wanted was rejected.

+

Maybe you tried to change something you didn't have access to.

+
+

If you are the application owner check the logs for more information.

+
+ + diff --git a/features/fixtures/delayed_job/app/public/500.html b/features/fixtures/delayed_job/app/public/500.html new file mode 100644 index 000000000..78a030af2 --- /dev/null +++ b/features/fixtures/delayed_job/app/public/500.html @@ -0,0 +1,66 @@ + + + + We're sorry, but something went wrong (500) + + + + + + +
+
+

We're sorry, but something went wrong.

+
+

If you are the application owner check the logs for more information.

+
+ + diff --git a/features/fixtures/delayed_job/app/public/apple-touch-icon-precomposed.png b/features/fixtures/delayed_job/app/public/apple-touch-icon-precomposed.png new file mode 100644 index 000000000..e69de29bb diff --git a/features/fixtures/delayed_job/app/public/apple-touch-icon.png b/features/fixtures/delayed_job/app/public/apple-touch-icon.png new file mode 100644 index 000000000..e69de29bb diff --git a/features/fixtures/delayed_job/app/public/favicon.ico b/features/fixtures/delayed_job/app/public/favicon.ico new file mode 100644 index 000000000..e69de29bb diff --git a/features/fixtures/delayed_job/app/public/robots.txt b/features/fixtures/delayed_job/app/public/robots.txt new file mode 100644 index 000000000..3c9c7c01f --- /dev/null +++ b/features/fixtures/delayed_job/app/public/robots.txt @@ -0,0 +1,5 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file +# +# To ban all spiders from the entire site uncomment the next two lines: +# User-agent: * +# Disallow: / diff --git a/features/fixtures/delayed_job/app/test/controllers/.keep b/features/fixtures/delayed_job/app/test/controllers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/features/fixtures/delayed_job/app/test/fixtures/.keep b/features/fixtures/delayed_job/app/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/features/fixtures/delayed_job/app/test/fixtures/files/.keep b/features/fixtures/delayed_job/app/test/fixtures/files/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/features/fixtures/delayed_job/app/test/fixtures/test_models.yml b/features/fixtures/delayed_job/app/test/fixtures/test_models.yml new file mode 100644 index 000000000..80aed36e3 --- /dev/null +++ b/features/fixtures/delayed_job/app/test/fixtures/test_models.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the '{}' from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/features/fixtures/delayed_job/app/test/helpers/.keep b/features/fixtures/delayed_job/app/test/helpers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/features/fixtures/delayed_job/app/test/integration/.keep b/features/fixtures/delayed_job/app/test/integration/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/features/fixtures/delayed_job/app/test/mailers/.keep b/features/fixtures/delayed_job/app/test/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/features/fixtures/delayed_job/app/test/models/.keep b/features/fixtures/delayed_job/app/test/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/features/fixtures/delayed_job/app/test/models/test_model_test.rb b/features/fixtures/delayed_job/app/test/models/test_model_test.rb new file mode 100644 index 000000000..c2d2c2b6b --- /dev/null +++ b/features/fixtures/delayed_job/app/test/models/test_model_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class TestModelTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/features/fixtures/delayed_job/app/test/test_helper.rb b/features/fixtures/delayed_job/app/test/test_helper.rb new file mode 100644 index 000000000..92e39b2d7 --- /dev/null +++ b/features/fixtures/delayed_job/app/test/test_helper.rb @@ -0,0 +1,10 @@ +ENV['RAILS_ENV'] ||= 'test' +require File.expand_path('../../config/environment', __FILE__) +require 'rails/test_help' + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + + # Add more helper methods to be used by all tests here... +end diff --git a/features/fixtures/delayed_job/app/tmp/.keep b/features/fixtures/delayed_job/app/tmp/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/features/fixtures/docker-compose.yml b/features/fixtures/docker-compose.yml index 0f56b30ea..a2118dada 100644 --- a/features/fixtures/docker-compose.yml +++ b/features/fixtures/docker-compose.yml @@ -41,9 +41,7 @@ services: build: context: delayed_job args: - ruby_version: 2.0 - depends_on: - - redis + ruby_version: 2.5 environment: - endpoint restart: "no" diff --git a/features/steps/ruby_notifier_steps.rb b/features/steps/ruby_notifier_steps.rb index 2832f00ac..42458810a 100644 --- a/features/steps/ruby_notifier_steps.rb +++ b/features/steps/ruby_notifier_steps.rb @@ -7,6 +7,15 @@ } end +When("I generate the gem and put it in {string}") do |fixture| + gem_dir = File.expand_path('../../../', __FILE__) + Dir.chdir(gem_dir) do + `rm bugsnag-*.gem` + `gem build bugsnag.gemspec` + `mv bugsnag-*.gem features/fixtures/#{fixture}` + end +end + When("I wait for the app to respond on port {string}") do |port| max_attempts = ENV.include?('MAX_MAZE_CONNECT_ATTEMPTS')? ENV['MAX_MAZE_CONNECT_ATTEMPTS'].to_i : 10 attempts = 0 From ccca100aa72e5d9fc5c584965743042d19c671b7 Mon Sep 17 00:00:00 2001 From: Alex Moinet Date: Tue, 30 Oct 2018 18:01:03 +0000 Subject: [PATCH 2/6] DelayedJob tests: Fixed up Delayed-job fixture and maze-tests for current delayed job integration --- features/delayed_job.feature | 17 ++++++------- features/fixtures/delayed_job/Dockerfile | 3 ++- .../app/config/initializers/bugsnag.rb | 13 +++++++++- .../app/config/initializers/delayed_job.rb | 3 +++ features/fixtures/docker-compose.yml | 24 ++++++++++++++++++- 5 files changed, 49 insertions(+), 11 deletions(-) create mode 100644 features/fixtures/delayed_job/app/config/initializers/delayed_job.rb diff --git a/features/delayed_job.feature b/features/delayed_job.feature index 8ca17ce09..e6fb8abc3 100644 --- a/features/delayed_job.feature +++ b/features/delayed_job.feature @@ -10,19 +10,20 @@ Scenario: An unhandled RuntimeError sends a report Given I set environment variable "RUBY_VERSION" to "2.5" And I start the service "delayed_job" And I run the command "bundle exec rails runner 'TestModel.delay.fail'" on the service "delayed_job" - And I wait for 1 seconds + And I wait for 5 seconds Then I should receive a request And the request used the Ruby notifier And the request used payload v4 headers And the request contained the api key "a35a2a72bd230ac0aa0f52715bbdc6aa" And the event "unhandled" is true And the event "severity" is "error" - And the event "context" is null + And the event "context" is "jobs:work" And the event "severityReason.type" is "unhandledExceptionMiddleware" - And the event "severityReason.attributes.framework" is "delayed_job" + And the event "severityReason.attributes.framework" is "DelayedJob" And the exception "errorClass" equals "RuntimeError" - And the "file" of stack frame 0 equals "/usr/src/app.rb" - And the "lineNumber" of stack frame 0 equals 33 - And the payload field "events.0.metaData.sidekiq" matches the JSON fixture in "features/fixtures/sidekiq/payloads/unhandled_metadata_ca_.json" - And the event "metaData.sidekiq.msg.created_at" is a parsable timestamp in seconds - And the event "metaData.sidekiq.msg.enqueued_at" is a parsable timestamp in seconds + And the event "metaData.job.class" equals "Delayed::Backend::ActiveRecord::Job" + And the event "metaData.job.id" is not null + And the event "metaData.job.attempts" equals "1 / 1" + And the event "metaData.job.payload.display_name" equals "TestModel.fail" + And the event "metaData.job.payload.method_name" equals "fail" + And the payload field "events.0.metaData.job.payload.args" is an array with 0 elements \ No newline at end of file diff --git a/features/fixtures/delayed_job/Dockerfile b/features/fixtures/delayed_job/Dockerfile index d9714fbe1..c9d45399f 100644 --- a/features/fixtures/delayed_job/Dockerfile +++ b/features/fixtures/delayed_job/Dockerfile @@ -11,7 +11,8 @@ RUN bundle install COPY app/ /usr/src/app -RUN bundle exec rails generate delayed_job:active_record +RUN bundle exec rake rails:update:bin +RUN bundle exec bin/rails generate delayed_job:active_record RUN bundle exec rake db:migrate CMD ["bundle", "exec", "rake", "jobs:work"] diff --git a/features/fixtures/delayed_job/app/config/initializers/bugsnag.rb b/features/fixtures/delayed_job/app/config/initializers/bugsnag.rb index c2aa28bc9..001b5f430 100644 --- a/features/fixtures/delayed_job/app/config/initializers/bugsnag.rb +++ b/features/fixtures/delayed_job/app/config/initializers/bugsnag.rb @@ -1,3 +1,14 @@ Bugsnag.configure do |config| - config.api_key = "0a336f52d5bc59451e518f3e682209c7" + config.api_key = ENV["BUGSNAG_API_KEY"] || ENV["MAZE_API_KEY"] + config.endpoint = ENV["BUGSNAG_ENDPOINT"] || ENV["MAZE_ENDPOINT"] + config.session_endpoint = ENV["BUGSNAG_ENDPOINT"] || ENV["MAZE_ENDPOINT"] + config.app_type = ENV["MAZE_APP_TYPE"] if ENV.include? "MAZE_APP_TYPE" + config.app_version = ENV["MAZE_APP_VERSION"] if ENV.include? "MAZE_APP_VERSION" + config.auto_notify = ENV["MAZE_AUTO_NOTIFY"] != "false" + config.project_root = ENV["MAZE_PROJECT_ROOT"] if ENV.include? "MAZE_PROJECT_ROOT" + config.ignore_classes << lambda { |ex| ex.class.to_s == ENV["MAZE_IGNORE_CLASS"] } if ENV.include? "MAZE_IGNORE_CLASS" + config.auto_capture_sessions = ENV["MAZE_AUTO_CAPTURE_SESSIONS"] == "true" + config.release_stage = ENV["MAZE_RELEASE_STAGE"] if ENV.include? "MAZE_RELEASE_STAGE" + config.send_code = ENV["MAZE_SEND_CODE"] != "false" + config.send_environment = ENV["MAZE_SEND_ENVIRONMENT"] == "true" end diff --git a/features/fixtures/delayed_job/app/config/initializers/delayed_job.rb b/features/fixtures/delayed_job/app/config/initializers/delayed_job.rb new file mode 100644 index 000000000..fe6b2130e --- /dev/null +++ b/features/fixtures/delayed_job/app/config/initializers/delayed_job.rb @@ -0,0 +1,3 @@ +require 'delayed_job' + +Delayed::Worker.max_attempts = 1 \ No newline at end of file diff --git a/features/fixtures/docker-compose.yml b/features/fixtures/docker-compose.yml index a2118dada..182d8184a 100644 --- a/features/fixtures/docker-compose.yml +++ b/features/fixtures/docker-compose.yml @@ -43,7 +43,29 @@ services: args: ruby_version: 2.5 environment: - - endpoint + - BUGSNAG_API_KEY + - http_proxy + - MAZE_API_KEY + - MAZE_APP_TYPE + - MAZE_APP_VERSION + - MAZE_AUTO_CAPTURE_SESSIONS + - MAZE_AUTO_NOTIFY + - MAZE_ENDPOINT + - MAZE_IGNORE_CLASS + - MAZE_IGNORE_MESSAGE + - MAZE_META_DATA_FILTERS + - MAZE_NOTIFY_RELEASE_STAGE + - MAZE_PROJECT_ROOT + - MAZE_PROXY_HOST + - MAZE_PROXY_PASSWORD + - MAZE_PROXY_PORT + - MAZE_PROXY_USER + - MAZE_RELEASE_STAGE + - MAZE_SEND_CODE + - MAZE_SEND_ENVIRONMENT + - MAZE_SESSION_ENDPOINT + - MAZE_TIMEOUT + - CALLBACK_INITIATOR restart: "no" rack1: From 2bde9be6c3bbe7ca21e3c9281f40ef711433b646 Mon Sep 17 00:00:00 2001 From: Alex Moinet Date: Fri, 2 Nov 2018 11:55:01 +0000 Subject: [PATCH 3/6] DelayedJob tests: Added two further delayed job scenarios for current integration --- features/delayed_job.feature | 40 ++++++++++++++++++- .../delayed_job/app/app/models/test_model.rb | 4 ++ 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/features/delayed_job.feature b/features/delayed_job.feature index e6fb8abc3..3c0809d72 100644 --- a/features/delayed_job.feature +++ b/features/delayed_job.feature @@ -26,4 +26,42 @@ Scenario: An unhandled RuntimeError sends a report And the event "metaData.job.attempts" equals "1 / 1" And the event "metaData.job.payload.display_name" equals "TestModel.fail" And the event "metaData.job.payload.method_name" equals "fail" - And the payload field "events.0.metaData.job.payload.args" is an array with 0 elements \ No newline at end of file + And the payload field "events.0.metaData.job.payload.args" is an array with 0 elements + +Scenario: An unhandled RuntimeError sends a report with arguments + Given I set environment variable "RUBY_VERSION" to "2.5" + And I start the service "delayed_job" + And I run the command "bundle exec rails runner 'TestModel.delay.fail_with_args(\"Test\")'" on the service "delayed_job" + And I wait for 5 seconds + Then I should receive a request + And the request used the Ruby notifier + And the request used payload v4 headers + And the request contained the api key "a35a2a72bd230ac0aa0f52715bbdc6aa" + And the event "unhandled" is true + And the event "severity" is "error" + And the event "context" is "jobs:work" + And the event "severityReason.type" is "unhandledExceptionMiddleware" + And the event "severityReason.attributes.framework" is "DelayedJob" + And the exception "errorClass" equals "RuntimeError" + And the event "metaData.job.class" equals "Delayed::Backend::ActiveRecord::Job" + And the event "metaData.job.id" is not null + And the event "metaData.job.attempts" equals "1 / 1" + And the event "metaData.job.payload.display_name" equals "TestModel.fail_with_args" + And the event "metaData.job.payload.method_name" equals "fail_with_args" + And the payload field "events.0.metaData.job.payload.args" is an array with 1 element + And the payload field "events.0.metaData.job.payload.args.0" equals "Test" + +Scenario: A handled exception sends a report + Given I set environment variable "RUBY_VERSION" to "2.5" + And I start the service "delayed_job" + And I run the command "bundle exec rails runner 'TestModel.delay.notify'" on the service "delayed_job" + And I wait for 5 seconds + Then I should receive a request + And the request used the Ruby notifier + And the request used payload v4 headers + And the request contained the api key "a35a2a72bd230ac0aa0f52715bbdc6aa" + And the event "unhandled" is false + And the event "severity" is "warning" + And the event "context" is "jobs:work" + And the event "severityReason.type" is "handledException" + And the exception "errorClass" equals "RuntimeError" diff --git a/features/fixtures/delayed_job/app/app/models/test_model.rb b/features/fixtures/delayed_job/app/app/models/test_model.rb index c77dee930..43a905ae6 100644 --- a/features/fixtures/delayed_job/app/app/models/test_model.rb +++ b/features/fixtures/delayed_job/app/app/models/test_model.rb @@ -10,4 +10,8 @@ def self.fail def self.fail_with_args(a) raise "uh oh" end + + def self.notify + Bugsnag.notify(RuntimeError.new("Handled exception")) + end end From 0efaa2aaea5850a41d755f812d130d1f1910b328 Mon Sep 17 00:00:00 2001 From: Alex Moinet Date: Mon, 5 Nov 2018 15:42:54 +0000 Subject: [PATCH 4/6] DelayedJob Maze: Added unpack to environment to avoid rebuilding docker container --- features/.gitignore | 1 + features/fixtures/delayed_job/Dockerfile | 3 +-- features/steps/ruby_notifier_steps.rb | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 features/.gitignore diff --git a/features/.gitignore b/features/.gitignore new file mode 100644 index 000000000..eb601e3bf --- /dev/null +++ b/features/.gitignore @@ -0,0 +1 @@ +temp-bugsnag-lib \ No newline at end of file diff --git a/features/fixtures/delayed_job/Dockerfile b/features/fixtures/delayed_job/Dockerfile index c9d45399f..8ea2c2b95 100644 --- a/features/fixtures/delayed_job/Dockerfile +++ b/features/fixtures/delayed_job/Dockerfile @@ -2,8 +2,7 @@ ARG ruby_version FROM ruby:$ruby_version WORKDIR /bugsnag -COPY *.gem ./ -RUN gem unpack bugsnag*.gem /bugsnag +COPY temp-bugsnag-lib ./ WORKDIR /usr/src/app COPY app/Gemfile /usr/src/app/ diff --git a/features/steps/ruby_notifier_steps.rb b/features/steps/ruby_notifier_steps.rb index 42458810a..de909d812 100644 --- a/features/steps/ruby_notifier_steps.rb +++ b/features/steps/ruby_notifier_steps.rb @@ -9,10 +9,12 @@ When("I generate the gem and put it in {string}") do |fixture| gem_dir = File.expand_path('../../../', __FILE__) + target_dir = "features/fixtures/#{fixture}" Dir.chdir(gem_dir) do `rm bugsnag-*.gem` `gem build bugsnag.gemspec` - `mv bugsnag-*.gem features/fixtures/#{fixture}` + `mv bugsnag-*.gem #{target_dir}` + `gem unpack #{target_dir}/bugsnag-*.gem --target #{target_dir}/temp-bugsnag-lib` end end From 2e785ec92fd258d0628e846e89eaec7cf9850eae Mon Sep 17 00:00:00 2001 From: Alex Moinet Date: Mon, 5 Nov 2018 15:51:02 +0000 Subject: [PATCH 5/6] DelayedJob Tests: Removed superfluous test --- features/delayed_job.feature | 22 ------------------- .../delayed_job/app/app/models/test_model.rb | 7 ------ 2 files changed, 29 deletions(-) diff --git a/features/delayed_job.feature b/features/delayed_job.feature index 3c0809d72..c9c63d87a 100644 --- a/features/delayed_job.feature +++ b/features/delayed_job.feature @@ -6,28 +6,6 @@ Background: And I configure the bugsnag endpoint And I generate the gem and put it in "delayed_job" -Scenario: An unhandled RuntimeError sends a report - Given I set environment variable "RUBY_VERSION" to "2.5" - And I start the service "delayed_job" - And I run the command "bundle exec rails runner 'TestModel.delay.fail'" on the service "delayed_job" - And I wait for 5 seconds - Then I should receive a request - And the request used the Ruby notifier - And the request used payload v4 headers - And the request contained the api key "a35a2a72bd230ac0aa0f52715bbdc6aa" - And the event "unhandled" is true - And the event "severity" is "error" - And the event "context" is "jobs:work" - And the event "severityReason.type" is "unhandledExceptionMiddleware" - And the event "severityReason.attributes.framework" is "DelayedJob" - And the exception "errorClass" equals "RuntimeError" - And the event "metaData.job.class" equals "Delayed::Backend::ActiveRecord::Job" - And the event "metaData.job.id" is not null - And the event "metaData.job.attempts" equals "1 / 1" - And the event "metaData.job.payload.display_name" equals "TestModel.fail" - And the event "metaData.job.payload.method_name" equals "fail" - And the payload field "events.0.metaData.job.payload.args" is an array with 0 elements - Scenario: An unhandled RuntimeError sends a report with arguments Given I set environment variable "RUBY_VERSION" to "2.5" And I start the service "delayed_job" diff --git a/features/fixtures/delayed_job/app/app/models/test_model.rb b/features/fixtures/delayed_job/app/app/models/test_model.rb index 43a905ae6..b5c675c27 100644 --- a/features/fixtures/delayed_job/app/app/models/test_model.rb +++ b/features/fixtures/delayed_job/app/app/models/test_model.rb @@ -1,11 +1,4 @@ class TestModel < ApplicationRecord - def self.print - puts "yo" - end - - def self.fail - raise "uh oh" - end def self.fail_with_args(a) raise "uh oh" From a3c335ddc99481ad3ec649abe6b021b5054cbb81 Mon Sep 17 00:00:00 2001 From: Alex Moinet Date: Tue, 6 Nov 2018 15:41:32 +0000 Subject: [PATCH 6/6] Maze Tests: Ensured latest gem is present in fixture paths --- features/delayed_job.feature | 1 - features/steps/ruby_notifier_steps.rb | 11 ----------- features/support/env.rb | 18 ++++++++++++++++++ 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/features/delayed_job.feature b/features/delayed_job.feature index c9c63d87a..db6357fed 100644 --- a/features/delayed_job.feature +++ b/features/delayed_job.feature @@ -4,7 +4,6 @@ Background: Given I set environment variable "BUGSNAG_API_KEY" to "a35a2a72bd230ac0aa0f52715bbdc6aa" And I set environment variable "MAZE_API_KEY" to "a35a2a72bd230ac0aa0f52715bbdc6aa" And I configure the bugsnag endpoint - And I generate the gem and put it in "delayed_job" Scenario: An unhandled RuntimeError sends a report with arguments Given I set environment variable "RUBY_VERSION" to "2.5" diff --git a/features/steps/ruby_notifier_steps.rb b/features/steps/ruby_notifier_steps.rb index de909d812..2832f00ac 100644 --- a/features/steps/ruby_notifier_steps.rb +++ b/features/steps/ruby_notifier_steps.rb @@ -7,17 +7,6 @@ } end -When("I generate the gem and put it in {string}") do |fixture| - gem_dir = File.expand_path('../../../', __FILE__) - target_dir = "features/fixtures/#{fixture}" - Dir.chdir(gem_dir) do - `rm bugsnag-*.gem` - `gem build bugsnag.gemspec` - `mv bugsnag-*.gem #{target_dir}` - `gem unpack #{target_dir}/bugsnag-*.gem --target #{target_dir}/temp-bugsnag-lib` - end -end - When("I wait for the app to respond on port {string}") do |port| max_attempts = ENV.include?('MAX_MAZE_CONNECT_ATTEMPTS')? ENV['MAX_MAZE_CONNECT_ATTEMPTS'].to_i : 10 attempts = 0 diff --git a/features/support/env.rb b/features/support/env.rb index c58b7ddcb..e837a8d9c 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -18,6 +18,22 @@ def output_logs end end +def install_fixture_gems + gem_dir = File.expand_path('../../../', __FILE__) + Dir.chdir(gem_dir) do + `rm bugsnag-*.gem` + `gem build bugsnag.gemspec` + Dir.foreach('features/fixtures') do |entry| + target_dir = "features/fixtures/#{entry}" + if File.directory? (target_dir) + `cp bugsnag-*.gem #{target_dir}` + `gem unpack #{target_dir}/bugsnag-*.gem --target #{target_dir}/temp-bugsnag-lib` + end + end + `rm bugsnag-*.gem` + end +end + def current_ip if OS.mac? 'host.docker.internal' @@ -27,3 +43,5 @@ def current_ip ip_list.captures.first end end + +install_fixture_gems