From f89b60669f4b999083b597393d9e76ce5ca7d473 Mon Sep 17 00:00:00 2001 From: Laust Rud Jacobsen Date: Sun, 15 Nov 2015 18:27:03 +0100 Subject: [PATCH] Rubocop: fix block delimiters --- .rubocop_todo.yml | 6 ------ app/controllers/apps_controller.rb | 20 ++++++++++---------- app/controllers/problems_controller.rb | 24 ++++++++++++------------ app/controllers/problems_searcher.rb | 16 ++++++++-------- app/controllers/users_controller.rb | 4 ++-- app/helpers/application_helper.rb | 4 ++-- app/interactors/problem_destroy.rb | 4 ++-- app/interactors/resolved_problem_clearer.rb | 4 ++-- config/load.rb | 12 ++++++------ lib/tasks/errbit/demo.rake | 5 +++-- spec/acceptance/app_regenerate_api_key_spec.rb | 12 ++++++------ spec/controllers/apps_controller_spec.rb | 4 ++-- spec/controllers/problems_controller_spec.rb | 12 ++++++------ spec/controllers/users_controller_spec.rb | 24 ++++++++++++------------ spec/decorators/issue_tracker_decorator_spec.rb | 4 ++-- spec/fabricators/app_fabricator.rb | 4 ++-- spec/fabricators/issue_tracker_fabricator.rb | 5 +++-- spec/fabricators/problem_fabricator.rb | 8 ++++---- spec/interactors/problem_destroy_spec.rb | 8 ++++---- spec/interactors/problem_merge_spec.rb | 16 ++++++++-------- spec/interactors/resolved_problem_clearer_spec.rb | 16 ++++++++-------- spec/interactors/user_destroy_spec.rb | 12 ++++++------ spec/lib/airbrake_api/v3/notice_parser_spec.rb | 8 ++++---- spec/models/app_spec.rb | 20 ++++++++++---------- spec/models/error_report_spec.rb | 52 ++++++++++++++++++++++++++-------------------------- spec/models/problem_spec.rb | 60 ++++++++++++++++++++++++++++++------------------------------ spec/models/user_spec.rb | 4 ++-- spec/requests/notices_controller_spec.rb | 16 ++++++++-------- spec/views/apps/edit.html.haml_spec.rb | 4 ++-- spec/views/apps/new.html.haml_spec.rb | 4 ++-- spec/views/issue_trackers/issue.md.erb_spec.rb | 4 ++-- spec/views/issue_trackers/issue.txt.erb_spec.rb | 4 ++-- spec/views/problems/show.html.haml_spec.rb | 12 ++++++------ spec/views/users/edit.html.haml_spec.rb | 4 ++-- spec/views/users/index.html.haml_spec.rb | 4 ++-- spec/views/users/new.html.haml_spec.rb | 4 ++-- 36 files changed, 210 insertions(+), 214 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 93acf52..5181c35 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -41,12 +41,6 @@ Rails/Output: - 'app/interactors/problem_recacher.rb' - 'db/seeds.rb' -# Offense count: 105 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles, ProceduralMethods, FunctionalMethods, IgnoredMethods. -Style/BlockDelimiters: - Enabled: false - # Offense count: 15 # Configuration parameters: EnforcedStyle, SupportedStyles. Style/ClassAndModuleChildren: diff --git a/app/controllers/apps_controller.rb b/app/controllers/apps_controller.rb index 167a04d..bf93fd9 100644 --- a/app/controllers/apps_controller.rb +++ b/app/controllers/apps_controller.rb @@ -8,9 +8,9 @@ class AppsController < ApplicationController expose(:app_scope) { App } - expose(:apps) { + expose(:apps) do app_scope.all.sort.map { |app| AppDecorator.new(app) } - } + end expose(:app, ancestor: :app_scope, attributes: :app_params) @@ -18,11 +18,11 @@ class AppsController < ApplicationController AppDecorator.new(app) end - expose(:all_errs) { + expose(:all_errs) do params[:all_errs].present? - } + end - expose(:problems) { + expose(:problems) do if request.format == :atom app.problems.unresolved.ordered else @@ -32,15 +32,15 @@ class AppsController < ApplicationController params[:environment] ).ordered_by(params_sort, params_order).page(params[:page]).per(current_user.per_page) end - } + end - expose(:deploys) { + expose(:deploys) do app.deploys.order_by(:created_at.desc).limit(5) - } + end - expose(:users) { + expose(:users) do User.all.sort_by { |u| u.name.downcase } - } + end def index; end diff --git a/app/controllers/problems_controller.rb b/app/controllers/problems_controller.rb index 029eb20..4f0ee46 100644 --- a/app/controllers/problems_controller.rb +++ b/app/controllers/problems_controller.rb @@ -11,27 +11,27 @@ class ProblemsController < ApplicationController :resolve_several, :unresolve_several, :unmerge_several ] - expose(:app_scope) { + expose(:app_scope) do params[:app_id] ? App.where(_id: params[:app_id]) : App.all - } + end - expose(:app) { + expose(:app) do AppDecorator.new app_scope.find(params[:app_id]) - } + end - expose(:problem) { + expose(:problem) do ProblemDecorator.new app.problems.find(params[:id]) - } + end - expose(:all_errs) { + expose(:all_errs) do params[:all_errs] - } + end - expose(:params_environement) { + expose(:params_environement) do params[:environment] - } + end - expose(:problems) { + expose(:problems) do pro = Problem. for_apps(app_scope). in_env(params_environement). @@ -43,7 +43,7 @@ class ProblemsController < ApplicationController else pro end - } + end def index; end diff --git a/app/controllers/problems_searcher.rb b/app/controllers/problems_searcher.rb index 8c634e0..1c14659 100644 --- a/app/controllers/problems_searcher.rb +++ b/app/controllers/problems_searcher.rb @@ -5,28 +5,28 @@ module ProblemsSearcher extend ActiveSupport::Concern included do - expose(:params_sort) { + expose(:params_sort) do if %w(app message last_notice_at last_deploy_at count).member?(params[:sort]) params[:sort] else "last_notice_at" end - } + end - expose(:params_order) { + expose(:params_order) do if %w(asc desc).member?(params[:order]) params[:order] else 'desc' end - } + end - expose(:selected_problems) { + expose(:selected_problems) do Array(Problem.find(err_ids)) - } + end - expose(:err_ids) { + expose(:err_ids) do (params[:problems] || []).compact - } + end end end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 22fe852..8856bbc 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -5,9 +5,9 @@ class UsersController < ApplicationController before_action :require_user_edit_priviledges, only: [:edit, :update] expose(:user, attributes: :user_params) - expose(:users) { + expose(:users) do User.all.page(params[:page]).per(current_user.per_page) - } + end def index; end def new; end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 12052be..55f86fc 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -20,7 +20,7 @@ module ApplicationHelper end def generate_ical(deploys) - RiCal.Calendar { |cal| + RiCal.Calendar do |cal| deploys.each_with_index do |deploy, idx| cal.event do |event| event.summary = "#{idx + 1} #{deploy.repository}" @@ -31,7 +31,7 @@ module ApplicationHelper event.organizer = deploy.username.to_s end end - }.to_s + end.to_s end def user_agent_graph(problem) diff --git a/app/interactors/problem_destroy.rb b/app/interactors/problem_destroy.rb index 21abafe..e8bf7f4 100644 --- a/app/interactors/problem_destroy.rb +++ b/app/interactors/problem_destroy.rb @@ -20,9 +20,9 @@ class ProblemDestroy # the number of problem destroy # def self.execute(problems) - Array(problems).each { |problem| + Array(problems).each do |problem| ProblemDestroy.new(problem).execute - }.count + end.count end private diff --git a/app/interactors/resolved_problem_clearer.rb b/app/interactors/resolved_problem_clearer.rb index 9a7a029..4bcc3d2 100644 --- a/app/interactors/resolved_problem_clearer.rb +++ b/app/interactors/resolved_problem_clearer.rb @@ -5,14 +5,14 @@ class ResolvedProblemClearer # Clear all problem already resolved # def execute - nb_problem_resolved.tap { |nb| + nb_problem_resolved.tap do |nb| if nb > 0 criteria.each do |problem| ProblemDestroy.new(problem).execute end repair_database end - } + end end private diff --git a/config/load.rb b/config/load.rb index 39fad42..83f7a35 100644 --- a/config/load.rb +++ b/config/load.rb @@ -29,9 +29,9 @@ Errbit::Config = Configurator.run( mongo_url: %w(MONGOLAB_URI MONGOHQ_URL MONGODB_URL MONGO_URL), # github - github_url: ['GITHUB_URL', lambda { |values| + github_url: ['GITHUB_URL', lambda do |values| values[:github_url].gsub(%r{/*\z}, '') - }], + end], github_authentication: ['GITHUB_AUTHENTICATION'], github_client_id: ['GITHUB_CLIENT_ID'], github_secret: ['GITHUB_SECRET'], @@ -40,9 +40,9 @@ Errbit::Config = Configurator.run( github_api_url: ['GITHUB_API_URL'], github_site_title: ['GITHUB_SITE_TITLE'], - email_delivery_method: ['EMAIL_DELIVERY_METHOD', lambda { |values| + email_delivery_method: ['EMAIL_DELIVERY_METHOD', lambda do |values| values[:email_delivery_method] && values[:email_delivery_method].to_sym - }], + end], # smtp settings smtp_address: ['SMTP_SERVER'], @@ -50,10 +50,10 @@ Errbit::Config = Configurator.run( smtp_authentication: ['SMTP_AUTHENTICATION'], smtp_user_name: %w(SMTP_USERNAME SENDGRID_USERNAME), smtp_password: %w(SMTP_PASSWORD SENDGRID_PASSWORD), - smtp_domain: ['SMTP_DOMAIN', 'SENDGRID_DOMAIN', lambda { |values| + smtp_domain: ['SMTP_DOMAIN', 'SENDGRID_DOMAIN', lambda do |values| values[:smtp_domain] || (values[:email_from] && values[:email_from].split('@').last) || nil - }], + end], # sendmail settings sendmail_location: ['SENDMAIL_LOCATION'], diff --git a/lib/tasks/errbit/demo.rake b/lib/tasks/errbit/demo.rake index b9cff4e..fdd8fa1 100644 --- a/lib/tasks/errbit/demo.rake +++ b/lib/tasks/errbit/demo.rake @@ -32,12 +32,13 @@ namespace :errbit do def random_backtrace backtrace = [] - 99.times {|t| + 99.times do |t| backtrace << { 'number' => t.hash % 1000, 'file' => "/path/to/file.rb", 'method' => RANDOM_METHODS.sample.to_s - }} + } + end backtrace end diff --git a/spec/acceptance/app_regenerate_api_key_spec.rb b/spec/acceptance/app_regenerate_api_key_spec.rb index f3eb7c9..a2645cd 100644 --- a/spec/acceptance/app_regenerate_api_key_spec.rb +++ b/spec/acceptance/app_regenerate_api_key_spec.rb @@ -3,9 +3,9 @@ require 'acceptance/acceptance_helper' feature "Regeneration api_Key" do let(:app) { Fabricate(:app) } let(:admin) { Fabricate(:admin) } - let(:user) { + let(:user) do Fabricate(:user_watcher, app: app).user - } + end before do app && admin @@ -16,9 +16,9 @@ feature "Regeneration api_Key" do log_in admin click_link app.name click_link I18n.t('apps.show.edit') - expect { + expect do click_link I18n.t('apps.fields.regenerate_api_key') - }.to change { + end.to change { app.reload.api_key } click_link I18n.t('shared.navigation.apps') @@ -36,9 +36,9 @@ end feature "Create an application" do let(:admin) { Fabricate(:admin) } - let(:user) { + let(:user) do Fabricate(:user_watcher, app: app).user - } + end before do admin diff --git a/spec/controllers/apps_controller_spec.rb b/spec/controllers/apps_controller_spec.rb index 7cf2583..c4c5e67 100644 --- a/spec/controllers/apps_controller_spec.rb +++ b/spec/controllers/apps_controller_spec.rb @@ -312,9 +312,9 @@ describe AppsController, type: 'controller' do it "should destroy the app" do delete :destroy, id: @app.id - expect { + expect do @app.reload - }.to raise_error(Mongoid::Errors::DocumentNotFound) + end.to raise_error(Mongoid::Errors::DocumentNotFound) end it "should display a message" do diff --git a/spec/controllers/problems_controller_spec.rb b/spec/controllers/problems_controller_spec.rb index b116606..5afecfa 100644 --- a/spec/controllers/problems_controller_spec.rb +++ b/spec/controllers/problems_controller_spec.rb @@ -326,10 +326,10 @@ describe ProblemsController, type: 'controller' do it "should unmerge a merged problem" do merged_problem = Problem.merge!(@problem1, @problem2) expect(merged_problem.errs.length).to eq 2 - expect { + expect do post :unmerge_several, problems: [merged_problem.id.to_s] expect(merged_problem.reload.errs.length).to eq 1 - }.to change(Problem, :count).by(1) + end.to change(Problem, :count).by(1) end end @@ -370,9 +370,9 @@ describe ProblemsController, type: 'controller' do context "POST /problems/destroy_several" do it "should delete the problems" do - expect { + expect do post :destroy_several, problems: [@problem1.id.to_s] - }.to change(Problem, :count).by(-1) + end.to change(Problem, :count).by(-1) end end @@ -385,9 +385,9 @@ describe ProblemsController, type: 'controller' do end it "destroys all problems" do - expect { + expect do post :destroy_all, app_id: @app.id - }.to change(Problem, :count).by(-2) + end.to change(Problem, :count).by(-2) expect(controller.app).to eq @app end diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb index d1c2f00..dbe0c51 100644 --- a/spec/controllers/users_controller_spec.rb +++ b/spec/controllers/users_controller_spec.rb @@ -56,9 +56,9 @@ describe UsersController, type: 'controller' do end it "should not be able to become an admin" do - expect { + expect do put :update, id: user.to_param, user: { admin: true } - }.to_not change { + end.to_not change { user.reload.admin }.from(false) end @@ -157,9 +157,9 @@ describe UsersController, type: 'controller' do end context "when the create is unsuccessful" do - let(:user) { + let(:user) do Struct.new(:admin, :attributes).new(true, {}) - } + end before do expect(User).to receive(:new).and_return(user) expect(user).to receive(:save).and_return(false) @@ -174,9 +174,9 @@ describe UsersController, type: 'controller' do context "PUT /users/:id" do context "when the update is successful" do - before { + before do put :update, id: user.to_param, user: user_params - } + end context "with normal params" do let(:user_params) { { name: 'Kermit' } } @@ -198,10 +198,10 @@ describe UsersController, type: 'controller' do context "with a destroy success" do let(:user_destroy) { double(destroy: true) } - before { + before do expect(UserDestroy).to receive(:new).with(user).and_return(user_destroy) delete :destroy, id: user.id - } + end it 'should destroy user' do expect(request.flash[:success]).to eq I18n.t('controllers.users.flash.destroy.success', name: user.name) @@ -210,10 +210,10 @@ describe UsersController, type: 'controller' do end context "with trying destroy himself" do - before { + before do expect(UserDestroy).to_not receive(:new) delete :destroy, id: admin.id - } + end it 'should not destroy user' do expect(response).to redirect_to(users_path) @@ -224,12 +224,12 @@ describe UsersController, type: 'controller' do describe "#user_params" do context "with current user not admin" do - before { + before do allow(controller).to receive(:current_user).and_return(user) allow(controller).to receive(:params).and_return( ActionController::Parameters.new(user_param) ) - } + end let(:user_param) { { 'user' => { name: 'foo', admin: true } } } it 'not have admin field' do expect(controller.send(:user_params)).to eq('name' => 'foo') diff --git a/spec/decorators/issue_tracker_decorator_spec.rb b/spec/decorators/issue_tracker_decorator_spec.rb index 9f8ebd2..2a0c550 100644 --- a/spec/decorators/issue_tracker_decorator_spec.rb +++ b/spec/decorators/issue_tracker_decorator_spec.rb @@ -1,6 +1,6 @@ describe IssueTrackerDecorator do let(:fake_tracker) do - klass = Class.new(ErrbitPlugin::IssueTracker) { + klass = Class.new(ErrbitPlugin::IssueTracker) do def self.label 'fake' end @@ -19,7 +19,7 @@ describe IssueTrackerDecorator do def configured? true end - } + end klass.new 'nothing special' end diff --git a/spec/fabricators/app_fabricator.rb b/spec/fabricators/app_fabricator.rb index 2162537..46a3f98 100644 --- a/spec/fabricators/app_fabricator.rb +++ b/spec/fabricators/app_fabricator.rb @@ -4,9 +4,9 @@ Fabricator(:app) do end Fabricator(:app_with_watcher, from: :app) do - watchers(count: 1) { |parent, _i| + watchers(count: 1) do |parent, _i| Fabricate.build(:watcher, app: parent) - } + end end Fabricator(:watcher) do diff --git a/spec/fabricators/issue_tracker_fabricator.rb b/spec/fabricators/issue_tracker_fabricator.rb index 5b5fb08..1d5e664 100644 --- a/spec/fabricators/issue_tracker_fabricator.rb +++ b/spec/fabricators/issue_tracker_fabricator.rb @@ -1,9 +1,10 @@ Fabricator :issue_tracker do type_tracker 'mock' - options { + options do { foo: 'one', bar: 'two' - }} + } + end app end diff --git a/spec/fabricators/problem_fabricator.rb b/spec/fabricators/problem_fabricator.rb index a4f0559..0519ca7 100644 --- a/spec/fabricators/problem_fabricator.rb +++ b/spec/fabricators/problem_fabricator.rb @@ -6,19 +6,19 @@ Fabricator(:problem) do end Fabricator(:problem_with_comments, from: :problem) do - after_create { |parent| + after_create do |parent| 3.times do Fabricate(:comment, err: parent) end - } + end end Fabricator(:problem_with_errs, from: :problem) do - after_create { |parent| + after_create do |parent| 3.times do Fabricate(:err, problem: parent) end - } + end end Fabricator(:problem_resolved, from: :problem) do diff --git a/spec/interactors/problem_destroy_spec.rb b/spec/interactors/problem_destroy_spec.rb index 34ab6d9..9cf5247 100644 --- a/spec/interactors/problem_destroy_spec.rb +++ b/spec/interactors/problem_destroy_spec.rb @@ -1,16 +1,16 @@ describe ProblemDestroy do - let(:problem_destroy) { + let(:problem_destroy) do ProblemDestroy.new(problem) - } + end context "in unit way" do - let(:problem) { + let(:problem) do problem = Problem.new allow(problem).to receive(:errs).and_return(double(:criteria, only: [err_1, err_2])) allow(problem).to receive(:comments).and_return(double(:criteria, only: [comment_1, comment_2])) allow(problem).to receive(:delete) problem - } + end let(:err_1) { Err.new } let(:err_2) { Err.new } diff --git a/spec/interactors/problem_merge_spec.rb b/spec/interactors/problem_merge_spec.rb index d72295c..1bf42ef 100644 --- a/spec/interactors/problem_merge_spec.rb +++ b/spec/interactors/problem_merge_spec.rb @@ -4,9 +4,9 @@ describe ProblemMerge do describe "#initialize" do it 'failed if less than 2 uniq problem pass in args' do - expect { + expect do ProblemMerge.new(problem) - }.to raise_error(ArgumentError) + end.to raise_error(ArgumentError) end it 'extract first problem like merged_problem' do @@ -20,18 +20,18 @@ describe ProblemMerge do end describe "#merge" do - let!(:problem_merge) { + let!(:problem_merge) do ProblemMerge.new(problem, problem_1) - } + end let(:first_errs) { problem.errs } let(:merged_errs) { problem_1.errs } let!(:notice) { Fabricate(:notice, err: first_errs.first) } let!(:notice_1) { Fabricate(:notice, err: merged_errs.first) } it 'delete one of problem' do - expect { + expect do problem_merge.merge - }.to change(Problem, :count).by(-1) + end.to change(Problem, :count).by(-1) end it 'move all err in one problem' do @@ -55,9 +55,9 @@ describe ProblemMerge do let!(:comment) { Fabricate(:comment, err: problem) } let!(:comment_2) { Fabricate(:comment, err: problem_1, user: comment.user) } it 'merge comment' do - expect { + expect do problem_merge.merge - }.to change { + end.to change { problem.comments.size }.from(1).to(2) expect(comment_2.reload.err).to eq problem diff --git a/spec/interactors/resolved_problem_clearer_spec.rb b/spec/interactors/resolved_problem_clearer_spec.rb index ec73c8e..dca7c7c 100644 --- a/spec/interactors/resolved_problem_clearer_spec.rb +++ b/spec/interactors/resolved_problem_clearer_spec.rb @@ -1,20 +1,20 @@ describe ResolvedProblemClearer do - let(:resolved_problem_clearer) { + let(:resolved_problem_clearer) do ResolvedProblemClearer.new - } + end describe "#execute" do - let!(:problems) { + let!(:problems) do [ Fabricate(:problem), Fabricate(:problem), Fabricate(:problem) ] - } + end context 'without problem resolved' do it 'do nothing' do - expect { + expect do expect(resolved_problem_clearer.execute).to eq 0 - }.to_not change { + end.to_not change { Problem.count } end @@ -34,9 +34,9 @@ describe ResolvedProblemClearer do end it 'delete problem resolve' do - expect { + expect do expect(resolved_problem_clearer.execute).to eq 2 - }.to change { + end.to change { Problem.count }.by(-2) expect(Problem.where(_id: problems.first.id).first).to be_nil diff --git a/spec/interactors/user_destroy_spec.rb b/spec/interactors/user_destroy_spec.rb index c708d68..20f9450 100644 --- a/spec/interactors/user_destroy_spec.rb +++ b/spec/interactors/user_destroy_spec.rb @@ -1,24 +1,24 @@ describe UserDestroy do - let(:app) { + let(:app) do Fabricate( :app, watchers: [ Fabricate.build(:user_watcher, user: user) ]) - } + end describe "#destroy" do let!(:user) { Fabricate(:user) } it 'should delete user' do - expect { + expect do UserDestroy.new(user).destroy - }.to change(User, :count) + end.to change(User, :count) end it 'should delete watcher' do - expect { + expect do UserDestroy.new(user).destroy - }.to change { + end.to change { app.reload.watchers.where(user_id: user.id).count }.from(1).to(0) end diff --git a/spec/lib/airbrake_api/v3/notice_parser_spec.rb b/spec/lib/airbrake_api/v3/notice_parser_spec.rb index 424dd7a..d434554 100644 --- a/spec/lib/airbrake_api/v3/notice_parser_spec.rb +++ b/spec/lib/airbrake_api/v3/notice_parser_spec.rb @@ -2,13 +2,13 @@ describe AirbrakeApi::V3::NoticeParser do let(:app) { Fabricate(:app) } it 'raises error when errors attribute is missing' do - expect { + expect do AirbrakeApi::V3::NoticeParser.new({}).report - }.to raise_error(AirbrakeApi::ParamsError) + end.to raise_error(AirbrakeApi::ParamsError) - expect { + expect do AirbrakeApi::V3::NoticeParser.new('errors' => []).report - }.to raise_error(AirbrakeApi::ParamsError) + end.to raise_error(AirbrakeApi::ParamsError) end it 'parses JSON payload and returns ErrorReport' do diff --git a/spec/models/app_spec.rb b/spec/models/app_spec.rb index 44d69bd..6cac76a 100644 --- a/spec/models/app_spec.rb +++ b/spec/models/app_spec.rb @@ -164,13 +164,13 @@ describe App, type: 'model' do context '#find_or_create_err!' do let(:app) { Fabricate(:app) } - let(:conditions) { + let(:conditions) do { error_class: 'Whoops', environment: 'production', fingerprint: 'some-finger-print' } - } + end it 'returns the correct err if one already exists' do existing = Fabricate( @@ -188,23 +188,23 @@ describe App, type: 'model' do it 'creates a new problem if a matching one does not already exist' do expect(Err.where(conditions).first).to be_nil - expect { + expect do app.find_or_create_err!(conditions) - }.to change(Problem, :count).by(1) + end.to change(Problem, :count).by(1) end context "without error_class" do - let(:conditions) { + let(:conditions) do { environment: 'production', fingerprint: 'some-finger-print' } - } + end it 'save the err' do expect(Err.where(conditions).first).to be_nil - expect { + expect do app.find_or_create_err!(conditions) - }.to change(Problem, :count).by(1) + end.to change(Problem, :count).by(1) end end end @@ -215,9 +215,9 @@ describe App, type: 'model' do expect(App.find_by_api_key!(app.api_key)).to eq app end it 'raise Mongoid::Errors::DocumentNotFound if not found' do - expect { + expect do App.find_by_api_key!('foo') - }.to raise_error(Mongoid::Errors::DocumentNotFound) + end.to raise_error(Mongoid::Errors::DocumentNotFound) end end end diff --git a/spec/models/error_report_spec.rb b/spec/models/error_report_spec.rb index 1456725..a34eea3 100644 --- a/spec/models/error_report_spec.rb +++ b/spec/models/error_report_spec.rb @@ -17,18 +17,18 @@ module Airbrake end describe ErrorReport do - let(:xml) { + let(:xml) do Rails.root.join('spec', 'fixtures', 'hoptoad_test_notice.xml').read - } + end let(:error_report) { ErrorReport.new(xml) } - let!(:app) { + let!(:app) do Fabricate( :app, api_key: 'APIKEY' ) - } + end describe "#app" do it 'find the good app' do @@ -44,39 +44,39 @@ describe ErrorReport do describe "#generate_notice!" do it "save a notice" do - expect { + expect do error_report.generate_notice! - }.to change { + end.to change { app.reload.problems.count }.by(1) end context "with a minimal notice" do - let(:xml) { + let(:xml) do Rails.root.join('spec', 'fixtures', 'minimal_test_notice.xml').read - } + end it 'save a notice' do - expect { + expect do error_report.generate_notice! - }.to change { + end.to change { app.reload.problems.count }.by(1) end end context "with notice generate by Airbrake gem" do - let(:xml) { + let(:xml) do Airbrake::Notice.new( exception: Exception.new, api_key: 'APIKEY', project_root: Rails.root ).to_xml - } + end it 'save a notice' do - expect { + expect do error_report.generate_notice! - }.to change { + end.to change { app.reload.problems.count }.by(1) end @@ -201,10 +201,10 @@ describe ErrorReport do end it 'memoize the notice' do - expect { + expect do error_report.generate_notice! error_report.generate_notice! - }.to change { + end.to change { Notice.count }.by(1) end @@ -213,9 +213,9 @@ describe ErrorReport do error_report.generate_notice! error_report.problem.resolve! - expect { + expect do ErrorReport.new(xml).generate_notice! - }.to change { + end.to change { error_report.problem.reload.resolved? }.from(true).to(false) end @@ -237,26 +237,26 @@ describe ErrorReport do end context "with xml without request section" do - let(:xml) { + let(:xml) do Rails.root.join('spec', 'fixtures', 'hoptoad_test_notice_without_request_section.xml').read - } + end it "save a notice" do - expect { + expect do error_report.generate_notice! - }.to change { + end.to change { app.reload.problems.count }.by(1) end end context "with xml with only a single line of backtrace" do - let(:xml) { + let(:xml) do Rails.root.join('spec', 'fixtures', 'hoptoad_test_notice_with_one_line_of_backtrace.xml').read - } + end it "save a notice" do - expect { + expect do error_report.generate_notice! - }.to change { + end.to change { app.reload.problems.count }.by(1) end diff --git a/spec/models/problem_spec.rb b/spec/models/problem_spec.rb index b4bf84b..5dda16d 100644 --- a/spec/models/problem_spec.rb +++ b/spec/models/problem_spec.rb @@ -10,25 +10,25 @@ describe Problem, type: 'model' do describe "Fabrication" do context "Fabricate(:problem)" do it 'should have no comment' do - expect { + expect do Fabricate(:problem) - }.to_not change(Comment, :count) + end.to_not change(Comment, :count) end end context "Fabricate(:problem_with_comments)" do it 'should have 3 comments' do - expect { + expect do Fabricate(:problem_with_comments) - }.to change(Comment, :count).by(3) + end.to change(Comment, :count).by(3) end end context "Fabricate(:problem_with_errs)" do it 'should have 3 errs' do - expect { + expect do Fabricate(:problem_with_errs) - }.to change(Err, :count).by(3) + end.to change(Err, :count).by(3) end end end @@ -65,9 +65,9 @@ describe Problem, type: 'model' do it "adding a notice caches its message" do err = Fabricate(:err) problem = err.problem - expect { + expect do Fabricate(:notice, err: err, message: 'ERR 1') - }.to change(problem, :message).from(nil).to('ERR 1') + end.to change(problem, :message).from(nil).to('ERR 1') end end @@ -132,9 +132,9 @@ describe Problem, type: 'model' do er.add_on_blank(:resolved) allow(problem).to receive(:errors).and_return(er) expect(problem).to_not be_valid - expect { + expect do problem.resolve! - }.to raise_error(Mongoid::Errors::Validations) + end.to raise_error(Mongoid::Errors::Validations) end end @@ -201,17 +201,17 @@ describe Problem, type: 'model' do end it "adding a notice increases #notices_count by 1" do - expect { + expect do Fabricate(:notice, err: @err, message: 'ERR 1') - }.to change(@problem.reload, :notices_count).from(0).to(1) + end.to change(@problem.reload, :notices_count).from(0).to(1) end it "removing a notice decreases #notices_count by 1" do Fabricate(:notice, err: @err, message: 'ERR 1') - expect { + expect do @err.notices.first.destroy @problem.reload - }.to change(@problem, :notices_count).from(1).to(0) + end.to change(@problem, :notices_count).from(1).to(0) end end @@ -226,10 +226,10 @@ describe Problem, type: 'model' do end it "is updated when an app is updated" do - expect { + expect do app.update_attributes!(name: "Bar App") problem.reload - }.to change(problem, :app_name).to("Bar App") + end.to change(problem, :app_name).to("Bar App") end end @@ -248,10 +248,10 @@ describe Problem, type: 'model' do it "is updated when a deploy is created" do problem = Fabricate(:problem, app: @app, environment: "production") next_deploy = 5.minutes.ago - expect { + expect do @deploy = Fabricate(:deploy, app: @app, created_at: next_deploy) problem.reload - }.to change { problem.last_deploy_at.iso8601 }. + end.to change { problem.last_deploy_at.iso8601 }. from(@last_deploy.iso8601). to(next_deploy.iso8601) end @@ -270,10 +270,10 @@ describe Problem, type: 'model' do it "removing a notice removes string from #messages" do Fabricate(:notice, err: @err, message: 'ERR 1') - expect { + expect do @err.notices.first.destroy @problem.reload - }.to change(@problem, :messages).from(Digest::MD5.hexdigest('ERR 1') => { 'value' => 'ERR 1', 'count' => 1 }).to({}) + end.to change(@problem, :messages).from(Digest::MD5.hexdigest('ERR 1') => { 'value' => 'ERR 1', 'count' => 1 }).to({}) end it "removing a notice from the problem with broken counter should not raise an error" do @@ -297,10 +297,10 @@ describe Problem, type: 'model' do it "removing a notice removes string from #hosts" do Fabricate(:notice, err: @err, request: { 'url' => "http://example.com/resource/12" }) - expect { + expect do @err.notices.first.destroy @problem.reload - }.to change(@problem, :hosts).from(Digest::MD5.hexdigest('example.com') => { 'value' => 'example.com', 'count' => 1 }).to({}) + end.to change(@problem, :hosts).from(Digest::MD5.hexdigest('example.com') => { 'value' => 'example.com', 'count' => 1 }).to({}) end end @@ -325,10 +325,10 @@ describe Problem, type: 'model' do } } ) - expect { + expect do @err.notices.first.destroy @problem.reload - }.to change(@problem, :user_agents). + end.to change(@problem, :user_agents). from( Digest::MD5.hexdigest('Chrome 10.0.648.204 (OS X 10.6.7)') => { 'value' => 'Chrome 10.0.648.204 (OS X 10.6.7)', 'count' => 1 } @@ -347,17 +347,17 @@ describe Problem, type: 'model' do end it "adding a comment increases #comments_count by 1" do - expect { + expect do Fabricate(:comment, err: @problem) - }.to change(@problem, :comments_count).from(0).to(1) + end.to change(@problem, :comments_count).from(0).to(1) end it "removing a comment decreases #comments_count by 1" do Fabricate(:comment, err: @problem) - expect { + expect do @problem.reload.comments.first.destroy @problem.reload - }.to change(@problem, :comments_count).from(1).to(0) + end.to change(@problem, :comments_count).from(1).to(0) end end @@ -420,9 +420,9 @@ describe Problem, type: 'model' do end it 'update the notice_count' do - expect { + expect do problem.recache - }.to change { + end.to change { problem.notices_count }.from(0).to(1) end diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 21aa8ff..e31eee7 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -39,10 +39,10 @@ describe User do context "First user" do it "should be created this admin access via db:seed" do - expect { + expect do allow($stdout).to receive(:puts).and_return(true) require Rails.root.join('db/seeds.rb') - }.to change { + end.to change { User.where(admin: true).count }.from(0).to(1) end diff --git a/spec/requests/notices_controller_spec.rb b/spec/requests/notices_controller_spec.rb index 8e2a149..8941ead 100644 --- a/spec/requests/notices_controller_spec.rb +++ b/spec/requests/notices_controller_spec.rb @@ -5,10 +5,10 @@ describe "Notices management", type: 'request' do context "with valide notice" do let(:xml) { Rails.root.join('spec', 'fixtures', 'hoptoad_test_notice.xml').read } it 'save a new notice' do - expect { + expect do post '/notifier_api/v2/notices', data: xml expect(response).to be_success - }.to change { + end.to change { errbit_app.problems.count }.by(1) end @@ -17,10 +17,10 @@ describe "Notices management", type: 'request' do context "with notice with empty backtrace" do let(:xml) { Rails.root.join('spec', 'fixtures', 'hoptoad_test_notice_without_line_of_backtrace.xml').read } it 'save a new notice' do - expect { + expect do post '/notifier_api/v2/notices', data: xml expect(response).to be_success - }.to change { + end.to change { errbit_app.problems.count }.by(1) end @@ -30,21 +30,21 @@ describe "Notices management", type: 'request' do let(:errbit_app) { Fabricate(:app) } let(:xml) { Rails.root.join('spec', 'fixtures', 'hoptoad_test_notice.xml').read } it 'not save a new notice and return 422' do - expect { + expect do post '/notifier_api/v2/notices', data: xml expect(response.status).to eq 422 expect(response.body).to eq "Your API key is unknown" - }.to_not change(errbit_app.problems, :count) + end.to_not change(errbit_app.problems, :count) end end context "with GET request" do let(:xml) { Rails.root.join('spec', 'fixtures', 'hoptoad_test_notice.xml').read } it 'save a new notice' do - expect { + expect do get '/notifier_api/v2/notices', data: xml expect(response).to be_success - }.to change { + end.to change { errbit_app.problems.count }.by(1) end diff --git a/spec/views/apps/edit.html.haml_spec.rb b/spec/views/apps/edit.html.haml_spec.rb index 9914368..f318c20 100644 --- a/spec/views/apps/edit.html.haml_spec.rb +++ b/spec/views/apps/edit.html.haml_spec.rb @@ -35,11 +35,11 @@ describe "apps/edit.html.haml", type: 'view' do end context "with unvalid app" do - let(:app) { + let(:app) do app = stub_model(App) app.errors.add(:base, 'You must specify your') app - } + end it 'see the error' do render diff --git a/spec/views/apps/new.html.haml_spec.rb b/spec/views/apps/new.html.haml_spec.rb index 890c59c..b6cb588 100644 --- a/spec/views/apps/new.html.haml_spec.rb +++ b/spec/views/apps/new.html.haml_spec.rb @@ -21,11 +21,11 @@ describe "apps/new.html.haml", type: 'view' do end context "with unvalid app" do - let(:app) { + let(:app) do app = stub_model(App) app.errors.add(:base, 'You must specify your') app - } + end it 'see the error' do render diff --git a/spec/views/issue_trackers/issue.md.erb_spec.rb b/spec/views/issue_trackers/issue.md.erb_spec.rb index ed8a9a0..6b1a624 100644 --- a/spec/views/issue_trackers/issue.md.erb_spec.rb +++ b/spec/views/issue_trackers/issue.md.erb_spec.rb @@ -1,9 +1,9 @@ describe "issue_trackers/issue.md.erb", type: 'view' do - let(:problem) { + let(:problem) do problem = Fabricate(:problem) Fabricate(:notice, err: Fabricate(:err, problem: problem)) problem - } + end before do allow(view).to receive(:problem).and_return(ProblemDecorator.new(problem)) diff --git a/spec/views/issue_trackers/issue.txt.erb_spec.rb b/spec/views/issue_trackers/issue.txt.erb_spec.rb index d9c6b8c..1daf330 100644 --- a/spec/views/issue_trackers/issue.txt.erb_spec.rb +++ b/spec/views/issue_trackers/issue.txt.erb_spec.rb @@ -1,9 +1,9 @@ describe "issue_trackers/issue.txt.erb", type: 'view' do - let(:problem) { + let(:problem) do problem = Fabricate(:problem) Fabricate(:notice, err: Fabricate(:err, problem: problem)) problem - } + end before do allow(view).to receive(:problem).and_return( diff --git a/spec/views/problems/show.html.haml_spec.rb b/spec/views/problems/show.html.haml_spec.rb index bae7cf8..aaaa051 100644 --- a/spec/views/problems/show.html.haml_spec.rb +++ b/spec/views/problems/show.html.haml_spec.rb @@ -1,7 +1,7 @@ describe "problems/show.html.haml", type: 'view' do let(:problem) { Fabricate(:problem) } let(:comment) { Fabricate(:comment) } - let(:pivotal_tracker) { + let(:pivotal_tracker) do Class.new(ErrbitPlugin::MockIssueTracker) do def self.label 'pivotal' @@ -15,8 +15,8 @@ describe "problems/show.html.haml", type: 'view' do true end end - } - let(:github_tracker) { + end + let(:github_tracker) do Class.new(ErrbitPlugin::MockIssueTracker) do def self.label 'github' @@ -30,13 +30,13 @@ describe "problems/show.html.haml", type: 'view' do true end end - } - let(:trackers) { + end + let(:trackers) do { 'github' => github_tracker, 'pivotal' => pivotal_tracker } - } + end let(:app) { AppDecorator.new(problem.app) } before do diff --git a/spec/views/users/edit.html.haml_spec.rb b/spec/views/users/edit.html.haml_spec.rb index 3d94ce9..5ddd8fc 100644 --- a/spec/views/users/edit.html.haml_spec.rb +++ b/spec/views/users/edit.html.haml_spec.rb @@ -1,9 +1,9 @@ describe 'users/edit.html.haml', type: 'view' do let(:user) { stub_model(User, name: 'shingara') } - before { + before do allow(view).to receive(:current_user).and_return(user) allow(view).to receive(:user).and_return(user) - } + end it 'should have per_page option' do render expect(rendered).to match(/id="user_per_page"/) diff --git a/spec/views/users/index.html.haml_spec.rb b/spec/views/users/index.html.haml_spec.rb index 20c82d3..c8a6e87 100644 --- a/spec/views/users/index.html.haml_spec.rb +++ b/spec/views/users/index.html.haml_spec.rb @@ -1,11 +1,11 @@ describe 'users/index.html.haml', type: 'view' do let(:user) { stub_model(User) } - before { + before do allow(view).to receive(:current_user).and_return(user) allow(view).to receive(:users).and_return( Kaminari.paginate_array([user], total_count: 1).page(1) ) - } + end it 'should see users option' do render expect(rendered).to match(/class='user_list'/) diff --git a/spec/views/users/new.html.haml_spec.rb b/spec/views/users/new.html.haml_spec.rb index 73ee8d5..18748ed 100644 --- a/spec/views/users/new.html.haml_spec.rb +++ b/spec/views/users/new.html.haml_spec.rb @@ -1,9 +1,9 @@ describe 'users/new.html.haml', type: 'view' do let(:user) { stub_model(User) } - before { + before do allow(view).to receive(:current_user).and_return(user) allow(view).to receive(:user).and_return(user) - } + end it 'should have per_page option' do render expect(rendered).to match(/id="user_per_page"/) -- libgit2 0.21.2