Skip to content

Commit

Permalink
Update rubocop and fix offenses
Browse files Browse the repository at this point in the history
  • Loading branch information
epergo committed Sep 9, 2017
1 parent 3741e00 commit 4f37dbb
Show file tree
Hide file tree
Showing 12 changed files with 20 additions and 19 deletions.
10 changes: 0 additions & 10 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@ AllCops:
# RuboCop has a bunch of cops enabled by default. This setting tells RuboCop
# to ignore them, so only the ones explicitly set in this file are enabled.
DisabledByDefault: true
Exclude:
- '**/templates/**/*'
- '**/vendor/**/*'
- 'actionpack/lib/action_dispatch/journey/parser.rb'

# Prefer &&/|| over and/or.
Style/AndOr:
Expand Down Expand Up @@ -77,12 +73,6 @@ Style/MethodDefParentheses:
Style/FrozenStringLiteralComment:
Enabled: true
EnforcedStyle: always
Exclude:
- 'actionview/test/**/*.builder'
- 'actionview/test/**/*.ruby'
- 'actionpack/test/**/*.builder'
- 'actionpack/test/**/*.ruby'
- 'activestorage/db/migrate/**/*.rb'

# Use `foo {}` not `foo{}`.
Layout/SpaceBeforeBlockBraces:
Expand Down
3 changes: 2 additions & 1 deletion spec/factories/votable.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# frozen_string_literal: true

FactoryGirl.define do
factory :votable do
end
end

3 changes: 2 additions & 1 deletion spec/factories/votable_cache.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# frozen_string_literal: true

FactoryGirl.define do
factory :votable_cache do
end
end

3 changes: 2 additions & 1 deletion spec/factories/votable_cache_update_attributes.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# frozen_string_literal: true

FactoryGirl.define do
factory :votable_cache_update_attributes do
end
end

3 changes: 2 additions & 1 deletion spec/factories/votable_cache_update_columns.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# frozen_string_literal: true

FactoryGirl.define do
factory :votable_cache_update_columns do
end
end

3 changes: 2 additions & 1 deletion spec/factories/votable_child_of_sti_not_votable.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# frozen_string_literal: true

FactoryGirl.define do
factory :child_of_sti_not_votable do
end
end

4 changes: 2 additions & 2 deletions spec/factories/votable_child_of_sti_votable.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# frozen_string_literal: true

FactoryGirl.define do
factory :child_of_sti_votable do
end
end


3 changes: 2 additions & 1 deletion spec/factories/votable_voter.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# frozen_string_literal: true

FactoryGirl.define do
factory :votable_voter do
end
end

2 changes: 2 additions & 0 deletions spec/factories/vote.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

FactoryGirl.define do
factory :vote, class: ActsAsVotable::Vote do
end
Expand Down
2 changes: 2 additions & 0 deletions spec/factories/voter.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

FactoryGirl.define do
factory :voter do
end
Expand Down
1 change: 0 additions & 1 deletion spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -137,4 +137,3 @@ def self.hw
"hello world"
end
end

2 changes: 2 additions & 0 deletions spec/support/factory_girl.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

# spec/support/factory_girl.rb
RSpec.configure do |config|
config.include FactoryGirl::Syntax::Methods
Expand Down

0 comments on commit 4f37dbb

Please sign in to comment.