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
2e521963
Commit
2e521963
authored
Apr 15, 2016
by
Gabriel Mazetto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix code-style and grammar
🤓
parent
4cb12d79
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
spec/services/merge_requests/merge_service_spec.rb
spec/services/merge_requests/merge_service_spec.rb
+3
-3
No files found.
spec/services/merge_requests/merge_service_spec.rb
View file @
2e521963
...
@@ -53,7 +53,7 @@ describe MergeRequests::MergeService, services: true do
...
@@ -53,7 +53,7 @@ describe MergeRequests::MergeService, services: true do
end
end
end
end
describe
:hooks_validation_pass?
do
describe
'#hooks_validation_pass?'
do
let
(
:service
)
{
MergeRequests
::
MergeService
.
new
(
project
,
user
,
commit_message:
'Awesome message'
)
}
let
(
:service
)
{
MergeRequests
::
MergeService
.
new
(
project
,
user
,
commit_message:
'Awesome message'
)
}
it
'returns true when valid'
do
it
'returns true when valid'
do
...
@@ -65,7 +65,7 @@ describe MergeRequests::MergeService, services: true do
...
@@ -65,7 +65,7 @@ describe MergeRequests::MergeService, services: true do
allow
(
project
).
to
receive
(
:git_hook
)
{
build
(
:git_hook
,
commit_message_regex:
'unmatched pattern .*'
)
}
allow
(
project
).
to
receive
(
:git_hook
)
{
build
(
:git_hook
,
commit_message_regex:
'unmatched pattern .*'
)
}
end
end
it
'returns false and save error when invalid'
do
it
'returns false and save
s
error when invalid'
do
expect
(
service
.
hooks_validation_pass?
(
merge_request
)).
to
be_falsey
expect
(
service
.
hooks_validation_pass?
(
merge_request
)).
to
be_falsey
expect
(
merge_request
.
merge_error
).
not_to
be_empty
expect
(
merge_request
.
merge_error
).
not_to
be_empty
end
end
...
@@ -76,7 +76,7 @@ describe MergeRequests::MergeService, services: true do
...
@@ -76,7 +76,7 @@ describe MergeRequests::MergeService, services: true do
allow
(
project
).
to
receive
(
:git_hook
)
{
build
(
:git_hook
,
author_email_regex:
'.*@unmatchedemaildomain.com'
)
}
allow
(
project
).
to
receive
(
:git_hook
)
{
build
(
:git_hook
,
author_email_regex:
'.*@unmatchedemaildomain.com'
)
}
end
end
it
'returns false and save error when invalid'
do
it
'returns false and save
s
error when invalid'
do
expect
(
service
.
hooks_validation_pass?
(
merge_request
)).
to
be_falsey
expect
(
service
.
hooks_validation_pass?
(
merge_request
)).
to
be_falsey
expect
(
merge_request
.
merge_error
).
not_to
be_empty
expect
(
merge_request
.
merge_error
).
not_to
be_empty
end
end
...
...
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