Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
20017ec67890
Commit
649c9969
authored
Jun 22, 2015
by
Robert Speicher
Browse files
Fix Style/IndentationConsistency cop violations
parent
652067542a4e
Changes
3
Hide whitespace changes
Inline
Side-by-side
spec/lib/gitlab/satellite/action_spec.rb
View file @
20017ec6
...
...
@@ -18,14 +18,12 @@
expect
(
starting_remote_count
).
to
be
>=
1
#kind of hookey way to add a second remote
origin_uri
=
repo
.
git
.
remote
({
v:
true
}).
split
(
" "
)[
1
]
begin
repo
.
git
.
remote
({
raise:
true
},
'add'
,
'another-remote'
,
origin_uri
)
repo
.
git
.
branch
({
raise:
true
},
'a-new-branch'
)
expect
(
repo
.
heads
.
size
).
to
be
>
(
starting_remote_count
)
expect
(
repo
.
git
.
remote
().
split
(
" "
).
size
).
to
be
>
(
starting_remote_count
)
rescue
end
repo
.
git
.
config
({},
"user.name"
,
"
#{
user
.
name
}
-- foo"
)
repo
.
git
.
config
({},
"user.email"
,
"
#{
user
.
email
}
-- foo"
)
...
...
spec/services/projects/update_service_spec.rb
View file @
20017ec6
...
...
@@ -13,8 +13,8 @@
before
do
@created_private
=
@project
.
private?
@opts
.
merge!
(
visibility_level:
Gitlab
::
VisibilityLevel
::
PRIVATE
)
update_project
(
@project
,
@user
,
@opts
)
@opts
.
merge!
(
visibility_level:
Gitlab
::
VisibilityLevel
::
PRIVATE
)
update_project
(
@project
,
@user
,
@opts
)
end
it
{
expect
(
@created_private
).
to
be_truthy
}
...
...
spec/services/projects/upload_service_spec.rb
View file @
20017ec6
...
...
@@ -22,7 +22,7 @@
it
{
expect
(
@link_to_file
[
'url'
]).
to
match
(
'banana_sample.gif'
)
}
end
context
'for valid png file'
do
context
'for valid png file'
do
before
do
png
=
fixture_file_upload
(
Rails
.
root
+
'spec/fixtures/dk.png'
,
'image/png'
)
...
...
@@ -38,7 +38,7 @@
it
{
expect
(
@link_to_file
[
'url'
]).
to
match
(
'dk.png'
)
}
end
context
'for valid jpg file'
do
context
'for valid jpg file'
do
before
do
jpg
=
fixture_file_upload
(
Rails
.
root
+
'spec/fixtures/rails_sample.jpg'
,
'image/jpg'
)
@link_to_file
=
upload_file
(
@project
.
repository
,
jpg
)
...
...
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