Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
779646ef
Commit
779646ef
authored
Jun 23, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix rubocop issues after merge of recent master
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
f40b99d0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
spec/support/matchers.rb
spec/support/matchers.rb
+5
-5
spec/tasks/gitlab/backup_rake_spec.rb
spec/tasks/gitlab/backup_rake_spec.rb
+2
-2
No files found.
spec/support/matchers.rb
View file @
779646ef
...
@@ -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
...
...
spec/tasks/gitlab/backup_rake_spec.rb
View file @
779646ef
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment