diff --git a/.rubocop.yml b/.rubocop.yml index a6f4c1f..463aad3 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -8,3 +8,6 @@ AllCops: # returns nil Rails/FindBy: Enabled: false + +Style/EmptyLineBetweenDefs: + AllowAdjacentOneLineDefs: true diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 0ed6061..226a93a 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -147,18 +147,6 @@ Style/EachWithObject: - 'app/models/notice_fingerprinter.rb' - 'lib/recurse.rb' -# Offense count: 14 -# Cop supports --auto-correct. -# Configuration parameters: AllowAdjacentOneLineDefs. -Style/EmptyLineBetweenDefs: - Exclude: - - 'app/controllers/apps_controller.rb' - - 'app/controllers/users_controller.rb' - - 'app/models/notification_service.rb' - - 'spec/decorators/issue_tracker_decorator_spec.rb' - - 'spec/decorators/issue_tracker_type_decorator_spec.rb' - - 'spec/views/problems/show.html.haml_spec.rb' - # Offense count: 22 # Cop supports --auto-correct. # Configuration parameters: AllowForAlignment. diff --git a/app/controllers/apps_controller.rb b/app/controllers/apps_controller.rb index ac07272..1cfcb67 100644 --- a/app/controllers/apps_controller.rb +++ b/app/controllers/apps_controller.rb @@ -43,6 +43,7 @@ class AppsController < ApplicationController } def index; end + def show app end diff --git a/spec/decorators/issue_tracker_decorator_spec.rb b/spec/decorators/issue_tracker_decorator_spec.rb index 5d21edd..22a2e05 100644 --- a/spec/decorators/issue_tracker_decorator_spec.rb +++ b/spec/decorators/issue_tracker_decorator_spec.rb @@ -3,6 +3,7 @@ describe IssueTrackerDecorator do klass = Class.new(ErrbitPlugin::IssueTracker) { def self.label; 'fake'; end def self.note; 'a note'; end + def self.fields { :foo => {:label => 'foo'}, diff --git a/spec/decorators/issue_tracker_type_decorator_spec.rb b/spec/decorators/issue_tracker_type_decorator_spec.rb index 29af52d..42a4a7c 100644 --- a/spec/decorators/issue_tracker_type_decorator_spec.rb +++ b/spec/decorators/issue_tracker_type_decorator_spec.rb @@ -3,12 +3,14 @@ describe IssueTrackerDecorator do klass = Class.new(ErrbitPlugin::IssueTracker) do def self.label; 'fake'; end def self.note; 'a note'; end + def self.fields { :foo => {:label => 'foo'}, :bar => {:label => 'bar'} } end + def self.icons { one: ['text/plain', 'all your base are belong to us'], -- libgit2 0.21.2