summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-06-23 10:46:29 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-06-23 10:46:29 +0200
commit779646ef38741dd30a51f57eed8818ab946fcae6 (patch)
tree135e92a6992990b7efa2da9479c6d0db4b59abb9 /spec
parentf40b99d02ee9411e5a7f9a93e3e6cf33c1d7890e (diff)
downloadgitlab-ce-779646ef38741dd30a51f57eed8818ab946fcae6.tar.gz
Fix rubocop issues after merge of recent master
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'spec')
-rw-r--r--spec/support/matchers.rb10
-rw-r--r--spec/tasks/gitlab/backup_rake_spec.rb4
2 files changed, 7 insertions, 7 deletions
diff --git a/spec/support/matchers.rb b/spec/support/matchers.rb
index e5ebc6e7ec8..a2f853e3e70 100644
--- a/spec/support/matchers.rb
+++ b/spec/support/matchers.rb
@@ -9,11 +9,11 @@ end
def emulate_user(user)
user = case user
- when :user then create(:user)
- when :visitor then nil
- when :admin then create(:admin)
- else user
- end
+ when :user then create(:user)
+ when :visitor then nil
+ when :admin then create(:admin)
+ else user
+ end
login_with(user) if user
end
diff --git a/spec/tasks/gitlab/backup_rake_spec.rb b/spec/tasks/gitlab/backup_rake_spec.rb
index 2f90b67aef1..cdcfeba8d1f 100644
--- a/spec/tasks/gitlab/backup_rake_spec.rb
+++ b/spec/tasks/gitlab/backup_rake_spec.rb
@@ -37,7 +37,7 @@ describe 'gitlab:app namespace rake task' do
it 'should fail on mismatch' do
allow(YAML).to receive(:load_file).
- and_return({gitlab_version: "not #{gitlab_version}" })
+ and_return({ gitlab_version: "not #{gitlab_version}" })
expect { run_rake_task('gitlab:backup:restore') }.
to raise_error(SystemExit)
@@ -45,7 +45,7 @@ describe 'gitlab:app namespace rake task' do
it 'should invoke restoration on mach' do
allow(YAML).to receive(:load_file).
- and_return({gitlab_version: gitlab_version})
+ and_return({ gitlab_version: gitlab_version })
expect(Rake::Task["gitlab:backup:db:restore"]).to receive(:invoke)
expect(Rake::Task["gitlab:backup:repo:restore"]).to receive(:invoke)
expect(Rake::Task["gitlab:shell:setup"]).to receive(:invoke)