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
d5d1dcc9
Commit
d5d1dcc9
authored
Apr 07, 2017
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix spec failures
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
d256852a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
spec/features/merge_requests/approvals_spec.rb
spec/features/merge_requests/approvals_spec.rb
+3
-3
spec/serializers/pipeline_serializer_spec.rb
spec/serializers/pipeline_serializer_spec.rb
+1
-1
No files found.
spec/features/merge_requests/approvals_spec.rb
View file @
d5d1dcc9
...
...
@@ -246,14 +246,14 @@ feature 'Merge request approvals', js: true, feature: true do
visit
namespace_project_merge_request_path
(
project
.
namespace
,
project
,
merge_request
)
end
it
'I am unable to set Merge
When Pipeline S
ucceeds'
do
it
'I am unable to set Merge
when pipeline s
ucceeds'
do
# before approval status is loaded
expect
(
page
).
to
have_button
(
'Merge
When Pipeline S
ucceeds'
,
disabled:
true
)
expect
(
page
).
to
have_button
(
'Merge
when pipeline s
ucceeds'
,
disabled:
true
)
wait_for_ajax
# after approval status is loaded
expect
(
page
).
to
have_button
(
'Merge
When Pipeline S
ucceeds'
,
disabled:
true
)
expect
(
page
).
to
have_button
(
'Merge
when pipeline s
ucceeds'
,
disabled:
true
)
end
end
...
...
spec/serializers/pipeline_serializer_spec.rb
View file @
d5d1dcc9
...
...
@@ -113,7 +113,7 @@ describe PipelineSerializer do
it
"verifies number of queries"
do
recorded
=
ActiveRecord
::
QueryRecorder
.
new
{
subject
}
expect
(
recorded
.
count
).
to
be_within
(
1
).
of
(
5
0
)
expect
(
recorded
.
count
).
to
be_within
(
1
).
of
(
5
3
)
expect
(
recorded
.
cached_count
).
to
eq
(
0
)
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