diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-06-14 23:46:32 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-06-14 23:46:32 +0000 |
| commit | 39bbdc4f254746cf6a943b7f44b9a01593c53339 (patch) | |
| tree | fe84a295826e817d780cc5285d598100e13cb73d | |
| parent | c953314aa3719482c319c873c5b732e43ce53f79 (diff) | |
| parent | c5a88df6b77173b634cc38d85d5c9c2735c69210 (diff) | |
| download | gitlab-ce-39bbdc4f254746cf6a943b7f44b9a01593c53339.tar.gz | |
Merge branch 'rs-fix-codeclimate-build' into 'master'
Require rubocop-rspec in the correct location
See merge request !12174
| -rw-r--r-- | rubocop/cop/rspec/single_line_hook.rb | 4 | ||||
| -rw-r--r-- | spec/rubocop/cop/rspec/single_line_hook_spec.rb | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/rubocop/cop/rspec/single_line_hook.rb b/rubocop/cop/rspec/single_line_hook.rb index a156b1d34cf..be611054323 100644 --- a/rubocop/cop/rspec/single_line_hook.rb +++ b/rubocop/cop/rspec/single_line_hook.rb @@ -1,3 +1,5 @@ +require 'rubocop-rspec' + module RuboCop module Cop module RSpec @@ -17,7 +19,7 @@ module RuboCop # after(:each) do # undo_something # end - class SingleLineHook < RuboCop::Cop::RSpec::Cop + class SingleLineHook < Cop MESSAGE = "Don't use single-line hook blocks.".freeze def_node_search :rspec_hook?, <<~PATTERN diff --git a/spec/rubocop/cop/rspec/single_line_hook_spec.rb b/spec/rubocop/cop/rspec/single_line_hook_spec.rb index f3eb8de63ac..6cf0831d3ad 100644 --- a/spec/rubocop/cop/rspec/single_line_hook_spec.rb +++ b/spec/rubocop/cop/rspec/single_line_hook_spec.rb @@ -2,7 +2,6 @@ require 'spec_helper' require 'rubocop' require 'rubocop/rspec/support' -require 'rubocop-rspec' require_relative '../../../../rubocop/cop/rspec/single_line_hook' |