kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix rubocop issues after merge of recent master

Browse source 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
Dmitriy Zaporozhets 2015-06-23 10:46:29 +02:00
parent f40b99d02e
commit 779646ef38
No known key found for this signature in database
GPG key ID: 161B5D6A44D3D88A
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
spec/support/matchers.rb
View file

@ -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

4
spec/tasks/gitlab/backup_rake_spec.rb
View file

@ -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)