summaryrefslogtreecommitdiff
path: root/.rubocop.yml
diff options
context:
space:
mode:
authorLuke "Jared" Bennett <lbennett@gitlab.com>2017-07-20 17:34:04 +0100
committerLuke "Jared" Bennett <lbennett@gitlab.com>2017-07-20 17:51:07 +0100
commit6448368b5b71d9c93b865d2cad0206b475db4553 (patch)
treeac26a315400e40ceba27eb37cadef461f2d77e54 /.rubocop.yml
parent115ffa3749300b58d7161610e27a41b844b3fb80 (diff)
parent7f78a78a36a4341680a71afa5a12a1f4d4876c66 (diff)
downloadgitlab-ce-6448368b5b71d9c93b865d2cad0206b475db4553.tar.gz
Merge remote-tracking branch 'origin/master' into ide
Diffstat (limited to '.rubocop.yml')
-rw-r--r--.rubocop.yml10
1 files changed, 10 insertions, 0 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index 32ec60f540b..9785e7626f9 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -965,6 +965,10 @@ RSpec/AnyInstance:
RSpec/BeEql:
Enabled: true
+# We don't enforce this as we use this technique in a few places.
+RSpec/BeforeAfterAll:
+ Enabled: false
+
# Check that the first argument to the top level describe is the tested class or
# module.
RSpec/DescribeClass:
@@ -1024,6 +1028,12 @@ RSpec/FilePath:
RSpec/Focus:
Enabled: true
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: is_expected, should
+RSpec/ImplicitExpect:
+ Enabled: true
+ EnforcedStyle: is_expected
+
# Checks for the usage of instance variables.
RSpec/InstanceVariable:
Enabled: false