Commit 779646ef authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Fix rubocop issues after merge of recent master

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent f40b99d0
...@@ -9,11 +9,11 @@ end ...@@ -9,11 +9,11 @@ end
def emulate_user(user) def emulate_user(user)
user = case user user = case user
when :user then create(:user) when :user then create(:user)
when :visitor then nil when :visitor then nil
when :admin then create(:admin) when :admin then create(:admin)
else user else user
end end
login_with(user) if user login_with(user) if user
end end
......
...@@ -37,7 +37,7 @@ describe 'gitlab:app namespace rake task' do ...@@ -37,7 +37,7 @@ describe 'gitlab:app namespace rake task' do
it 'should fail on mismatch' do it 'should fail on mismatch' do
allow(YAML).to receive(:load_file). 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') }. expect { run_rake_task('gitlab:backup:restore') }.
to raise_error(SystemExit) to raise_error(SystemExit)
...@@ -45,7 +45,7 @@ describe 'gitlab:app namespace rake task' do ...@@ -45,7 +45,7 @@ describe 'gitlab:app namespace rake task' do
it 'should invoke restoration on mach' do it 'should invoke restoration on mach' do
allow(YAML).to receive(:load_file). 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:db:restore"]).to receive(:invoke)
expect(Rake::Task["gitlab:backup:repo:restore"]).to receive(:invoke) expect(Rake::Task["gitlab:backup:repo:restore"]).to receive(:invoke)
expect(Rake::Task["gitlab:shell:setup"]).to receive(:invoke) expect(Rake::Task["gitlab:shell:setup"]).to receive(:invoke)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment