diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 1b152a7..2c2b53c 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -159,12 +159,6 @@ Style/EmptyLineBetweenDefs: - 'spec/decorators/issue_tracker_type_decorator_spec.rb' - 'spec/views/problems/show.html.haml_spec.rb' -# Offense count: 28 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles. -Style/EmptyLinesAroundBlockBody: - Enabled: false - # Offense count: 9 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle, SupportedStyles. diff --git a/app/controllers/problems_searcher.rb b/app/controllers/problems_searcher.rb index 040d043..e84732d 100644 --- a/app/controllers/problems_searcher.rb +++ b/app/controllers/problems_searcher.rb @@ -5,7 +5,6 @@ module ProblemsSearcher extend ActiveSupport::Concern included do - expose(:params_sort) { unless %w{app message last_notice_at last_deploy_at count}.member?(params[:sort]) "last_notice_at" @@ -29,6 +28,5 @@ module ProblemsSearcher expose(:err_ids) { (params[:problems] || []).compact } - end end diff --git a/app/helpers/hash_helper.rb b/app/helpers/hash_helper.rb index 2fc80a8..50409c3 100644 --- a/app/helpers/hash_helper.rb +++ b/app/helpers/hash_helper.rb @@ -13,7 +13,6 @@ module HashHelper pretty += "\n#{' '*nesting*tab_size}" pretty += "#{key.inspect} => #{val}" pretty += "," unless key == sorted_keys.last - end nesting -= 1 pretty += "\n#{' '*nesting*tab_size}}" diff --git a/config/routes.rb b/config/routes.rb index df63f5b..1dac2ec 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,4 @@ Rails.application.routes.draw do - devise_for :users, :controllers => { :omniauth_callbacks => "users/omniauth_callbacks" } # Hoptoad Notifier Routes diff --git a/spec/acceptance/app_regenerate_api_key_spec.rb b/spec/acceptance/app_regenerate_api_key_spec.rb index 14b803c..7ed482c 100644 --- a/spec/acceptance/app_regenerate_api_key_spec.rb +++ b/spec/acceptance/app_regenerate_api_key_spec.rb @@ -35,7 +35,6 @@ feature "Regeneration api_Key" do end feature "Create an application" do - let(:admin) { Fabricate(:admin) } let(:user) { Fabricate(:user_watcher, :app => app).user @@ -63,7 +62,6 @@ feature "Create an application" do page.has_content?(I18n.t('controllers.apps.flash.update.success')) expect(App.where(:name => 'My new app').count).to eq 0 expect(App.where(:name => 'My new app 2').count).to eq 1 - end scenario "create an apps with issue tracker and edit it", :js => true do diff --git a/spec/acceptance/sign_in_with_github_spec.rb b/spec/acceptance/sign_in_with_github_spec.rb index 6e77700..8e88313 100644 --- a/spec/acceptance/sign_in_with_github_spec.rb +++ b/spec/acceptance/sign_in_with_github_spec.rb @@ -1,7 +1,6 @@ require 'acceptance/acceptance_helper' feature 'Sign in with GitHub' do - background do allow(Errbit::Config).to receive(:github_authentication).and_return(true) Fabricate(:user, :github_login => 'nashby') diff --git a/spec/controllers/api/v1/notices_controller_spec.rb b/spec/controllers/api/v1/notices_controller_spec.rb index ef26217..6b85e00 100644 --- a/spec/controllers/api/v1/notices_controller_spec.rb +++ b/spec/controllers/api/v1/notices_controller_spec.rb @@ -28,14 +28,12 @@ describe Api::V1::NoticesController, type: 'controller' do end describe "given a date range" do - it "should return only the notices created during the date range" do get :index, {:auth_token => @user.authentication_token, :start_date => "2012-08-01", :end_date => "2012-08-27"} expect(response).to be_success notices = JSON.load response.body expect(notices.length).to eq 3 end - end it "should return all notices" do @@ -44,7 +42,6 @@ describe Api::V1::NoticesController, type: 'controller' do notices = JSON.load response.body expect(notices.length).to eq 4 end - end end end diff --git a/spec/controllers/apps_controller_spec.rb b/spec/controllers/apps_controller_spec.rb index 144b753..796806b 100644 --- a/spec/controllers/apps_controller_spec.rb +++ b/spec/controllers/apps_controller_spec.rb @@ -330,7 +330,6 @@ describe AppsController, type: 'controller' do end describe "POST /apps/:id/regenerate_api_key" do - context "like watcher" do before do sign_in watcher.user @@ -340,7 +339,6 @@ describe AppsController, type: 'controller' do post :regenerate_api_key, :id => 'foo' expect(request).to redirect_to root_path end - end context "like admin" do diff --git a/spec/controllers/notices_controller_spec.rb b/spec/controllers/notices_controller_spec.rb index 3ac34bf..1e3614a 100644 --- a/spec/controllers/notices_controller_spec.rb +++ b/spec/controllers/notices_controller_spec.rb @@ -34,7 +34,6 @@ describe NoticesController, type: 'controller' do expect(response.body).to match(%r{]*>#{notice.id}}) expect(response.body).to match(%r{]*>(.+)#{locate_path(notice.id)}}) end - end it "generates a notice from xml in a data param [POST]" do diff --git a/spec/controllers/problems_controller_spec.rb b/spec/controllers/problems_controller_spec.rb index abfc54b..4351766 100644 --- a/spec/controllers/problems_controller_spec.rb +++ b/spec/controllers/problems_controller_spec.rb @@ -318,7 +318,6 @@ describe ProblemsController, type: 'controller' do end context "POST /problems/unmerge_several" do - it "should require at least one problem" do post :unmerge_several, :problems => [] expect(request.flash[:notice]).to eql I18n.t('controllers.problems.flash.no_select_problem') @@ -332,11 +331,9 @@ describe ProblemsController, type: 'controller' do expect(merged_problem.reload.errs.length).to eq 1 }.to change(Problem, :count).by(1) end - end context "POST /problems/resolve_several" do - it "should require at least one problem" do post :resolve_several, :problems => [] expect(request.flash[:notice]).to eql I18n.t('controllers.problems.flash.no_select_problem') @@ -360,7 +357,6 @@ describe ProblemsController, type: 'controller' do end context "POST /problems/unresolve_several" do - it "should require at least one problem" do post :unresolve_several, :problems => [] expect(request.flash[:notice]).to eql I18n.t('controllers.problems.flash.no_select_problem') diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb index a7977d1..9b3705c 100644 --- a/spec/controllers/users_controller_spec.rb +++ b/spec/controllers/users_controller_spec.rb @@ -34,7 +34,6 @@ describe UsersController, type: 'controller' do expect(controller.user).to eq(user) expect(response).to render_template 'edit' end - end context "PUT /users/:other_id" do @@ -188,7 +187,6 @@ describe UsersController, type: 'controller' do end end context "when the update is unsuccessful" do - it "renders the edit page" do put :update, :id => user.to_param, :user => {:name => nil} expect(response).to render_template(:edit) diff --git a/spec/interactors/problem_destroy_spec.rb b/spec/interactors/problem_destroy_spec.rb index 2f7bfb3..0d1e95f 100644 --- a/spec/interactors/problem_destroy_spec.rb +++ b/spec/interactors/problem_destroy_spec.rb @@ -44,7 +44,6 @@ describe ProblemDestroy do problem_destroy.execute end end - end context "in integration way" do diff --git a/spec/models/error_report_spec.rb b/spec/models/error_report_spec.rb index 14b5b57..10fa029 100644 --- a/spec/models/error_report_spec.rb +++ b/spec/models/error_report_spec.rb @@ -292,7 +292,6 @@ describe ErrorReport do it 'return the notice' do expect(error_report.notice).to be_a Notice end - end end diff --git a/spec/models/notice_observer_spec.rb b/spec/models/notice_observer_spec.rb index 79abfb3..f29f766 100644 --- a/spec/models/notice_observer_spec.rb +++ b/spec/models/notice_observer_spec.rb @@ -129,7 +129,6 @@ describe "Callback on Notice", type: 'model' do describe 'should not send a notification if a notification service is not' \ 'configured' do - let(:notification_service) { Fabricate(:notification_service) } let(:app) { Fabricate(:app, notification_service: notification_service )} let(:notice_attrs) { notice_attrs_for.call(app.api_key) } diff --git a/spec/models/notification_service/gtalk_service_spec.rb b/spec/models/notification_service/gtalk_service_spec.rb index edf016f..6d6351d 100644 --- a/spec/models/notification_service/gtalk_service_spec.rb +++ b/spec/models/notification_service/gtalk_service_spec.rb @@ -88,7 +88,6 @@ describe NotificationServices::GtalkService, type: 'model' do @notification_service.room_id = "" @notification_service.create_notification(@problem) end - end it "it should send a notification to room only" do diff --git a/spec/models/notification_service/notification_service_spec.rb b/spec/models/notification_service/notification_service_spec.rb index fae4f35..0d8cad5 100644 --- a/spec/models/notification_service/notification_service_spec.rb +++ b/spec/models/notification_service/notification_service_spec.rb @@ -1,5 +1,4 @@ describe NotificationServices, type: 'model' do - let(:notice) { Fabricate :notice } let(:notification_service) { Fabricate :notification_service, :app => notice.app } let(:problem) { notice.problem } diff --git a/spec/views/apps/new.html.haml_spec.rb b/spec/views/apps/new.html.haml_spec.rb index 0ef5502..31840dc 100644 --- a/spec/views/apps/new.html.haml_spec.rb +++ b/spec/views/apps/new.html.haml_spec.rb @@ -18,7 +18,6 @@ describe "apps/new.html.haml", type: 'view' do expect(action_bar).to have_selector('a.button', :text => 'cancel') end - end context "with unvalid app" do diff --git a/spec/views/problems/show.html.haml_spec.rb b/spec/views/problems/show.html.haml_spec.rb index 0056785..292bd84 100644 --- a/spec/views/problems/show.html.haml_spec.rb +++ b/spec/views/problems/show.html.haml_spec.rb @@ -104,7 +104,6 @@ describe "problems/show.html.haml", type: 'view' do render expect(view.content_for(:action_bar)).to_not match(/create issue/) end - end context "with tracker associate on app" do @@ -138,7 +137,6 @@ describe "problems/show.html.haml", type: 'view' do render expect(view.content_for(:action_bar)).to match(/create issue/) end - end context "with problem with issue link" do diff --git a/spec/views/users/show.html.haml_spec.rb b/spec/views/users/show.html.haml_spec.rb index 1012e11..5e9eeb0 100644 --- a/spec/views/users/show.html.haml_spec.rb +++ b/spec/views/users/show.html.haml_spec.rb @@ -55,7 +55,6 @@ describe 'users/show.html.haml', type: 'view' do render expect(view.content_for(:action_bar)).to have_selector('a.delete[data-confirm="%s"]' % I18n.t('.users.confirm_delete')) end - end end end -- libgit2 0.21.2