@@ -16,6 +16,7 @@ AllCops:
1616 - ' db/schema.rb'
1717 - ' vendor/**/*'
1818
19+ <<<<<<< HEAD
1920Capybara/ClickLinkOrButtonStyle : { EnforcedStyle: link_or_button }
2021Layout/LineLength : { Max: 80, Exclude: [db/migrate/*.rb] }
2122Layout/RedundantLineBreak : { InspectBlocks: true }
@@ -31,6 +32,35 @@ RSpec/MessageExpectation:
3132RSpec/MessageSpies : { EnforcedStyle: receive }
3233RSpec/MultipleMemoizedHelpers : { AllowSubject: false, Max: 0 }
3334Style/ClassAndModuleChildren : { EnforcedStyle: compact }
35+ =======
36+ # ###############################################################################
37+ #
38+ # Rules that depart from rubocop defaults
39+ #
40+ # ###############################################################################
41+
42+ Style/ModuleFunction : { EnforcedStyle: extend_self }
43+ Layout/LineLength :
44+ Max : 80
45+ AutoCorrect : true
46+ Exclude : ['config/**/*']
47+ Layout/MultilineMethodCallIndentation : { EnforcedStyle: indented }
48+ Layout/MultilineOperationIndentation : { EnforcedStyle: indented }
49+ Metrics/BlockLength :
50+ AllowedMethods :
51+ - describe
52+ Exclude :
53+ - Guardfile
54+ - db/schema.rb
55+ - config/environments/development.rb
56+ Rails/FilePath : { EnforcedStyle: slashes }
57+ Metrics/MethodLength : { Exclude: [db/migrate/**/*.rb] }
58+ RSpec/MultipleExpectations :
59+ Exclude :
60+ - spec/system/**/*.rb
61+ RSpec/MessageExpectation : { EnforcedStyle: expect }
62+ Style/ArrayFirstLast : { Exclude: [Guardfile] }
63+ >>>>>>> bfb1757 (Rubocop: require click_on in system tests (#1393))
3464Style/MethodCallWithArgsParentheses :
3565 AllowedMethods :
3666 - and
@@ -56,18 +86,25 @@ Style/Documentation: { Enabled: false }
5686# ###############################################################################
5787
5888Bundler/GemComment : { Enabled: false }
89+ <<<<<<< HEAD
5990Bundler/GemVersion : { Enabled: false }
91+ =======
92+ >>>>>>> bfb1757 (Rubocop: require click_on in system tests (#1393))
6093Capybara/AmbiguousClick : { Enabled: false }
6194Layout/SingleLineBlockChain : { Enabled: false }
6295Lint/ConstantResolution : { Enabled: false }
6396Rails/BulkChangeTable : { Enabled: false }
6497Rails/RedundantPresenceValidationOnBelongsTo : { Enabled: false }
6598RSpec/AlignLeftLetBrace : { Enabled: false }
6699RSpec/AlignRightLetBrace : { Enabled: false }
100+ <<<<<<< HEAD
67101Rails/HasManyOrHasOneDependent : { Enabled: false }
68102RSpec/IndexedLet : { Enabled: false }
69103RSpec/StubbedMock : { Enabled: false }
70104Rails/SchemaComment : { Enabled: false }
105+ =======
106+ Style/CommentedKeyword : { Enabled: false }
107+ >>>>>>> bfb1757 (Rubocop: require click_on in system tests (#1393))
71108Style/ConstantVisibility : { Enabled: false }
72109Style/Copyright : { Enabled: false }
73110Style/InlineComment : { Enabled: false }
0 commit comments