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
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
fb12b81b
Commit
fb12b81b
authored
Oct 05, 2015
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make rubocop happy
parent
198f4b70
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
spec/factories/ci/commits.rb
spec/factories/ci/commits.rb
+2
-2
spec/services/ci/create_commit_service_spec.rb
spec/services/ci/create_commit_service_spec.rb
+1
-1
No files found.
spec/factories/ci/commits.rb
View file @
fb12b81b
...
@@ -30,13 +30,13 @@ FactoryGirl.define do
...
@@ -30,13 +30,13 @@ FactoryGirl.define do
factory
:ci_commit_with_one_job
do
factory
:ci_commit_with_one_job
do
after
(
:build
)
do
|
commit
|
after
(
:build
)
do
|
commit
|
allow
(
commit
).
to
receive
(
:ci_yaml_file
)
{
YAML
.
dump
({
rspec:
{
script:
"ls"
}
})
}
allow
(
commit
).
to
receive
(
:ci_yaml_file
)
{
YAML
.
dump
({
rspec:
{
script:
"ls"
}
})
}
end
end
end
end
factory
:ci_commit_with_two_jobs
do
factory
:ci_commit_with_two_jobs
do
after
(
:build
)
do
|
commit
|
after
(
:build
)
do
|
commit
|
allow
(
commit
).
to
receive
(
:ci_yaml_file
)
{
YAML
.
dump
({
rspec:
{
script:
"ls"
},
spinach:
{
script:
"ls"
}
})
}
allow
(
commit
).
to
receive
(
:ci_yaml_file
)
{
YAML
.
dump
({
rspec:
{
script:
"ls"
},
spinach:
{
script:
"ls"
}
})
}
end
end
end
end
...
...
spec/services/ci/create_commit_service_spec.rb
View file @
fb12b81b
...
@@ -71,7 +71,7 @@ module Ci
...
@@ -71,7 +71,7 @@ module Ci
end
end
describe
:ci_skip?
do
describe
:ci_skip?
do
let
(
:message
)
{
"some message[ci skip]"
}
let
(
:message
)
{
"some message[ci skip]"
}
before
do
before
do
allow_any_instance_of
(
Ci
::
Commit
).
to
receive
(
:git_commit_message
)
{
message
}
allow_any_instance_of
(
Ci
::
Commit
).
to
receive
(
:git_commit_message
)
{
message
}
...
...
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