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
1b4fd63c
Commit
1b4fd63c
authored
Aug 04, 2017
by
Shinya Maeda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix spec
parent
f2f1b9e3
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
1 deletion
+3
-1
spec/features/merge_requests/pipelines_spec.rb
spec/features/merge_requests/pipelines_spec.rb
+3
-1
No files found.
spec/features/merge_requests/pipelines_spec.rb
View file @
1b4fd63c
...
@@ -29,7 +29,7 @@ feature 'Pipelines for Merge Requests', js: true do
...
@@ -29,7 +29,7 @@ feature 'Pipelines for Merge Requests', js: true do
end
end
wait_for_requests
wait_for_requests
expect
(
page
).
to
have_selector
(
'.s
ssssssss
'
)
expect
(
page
).
to
have_selector
(
'.s
tage-cell
'
)
end
end
end
end
...
@@ -66,6 +66,7 @@ feature 'Pipelines for Merge Requests', js: true do
...
@@ -66,6 +66,7 @@ feature 'Pipelines for Merge Requests', js: true do
stub_ci_pipeline_to_return_yaml_file
stub_ci_pipeline_to_return_yaml_file
threads
=
[]
threads
=
[]
threads
<<
Thread
.
new
do
threads
<<
Thread
.
new
do
@merge_request
=
MergeRequests
::
CreateService
.
new
(
project
,
user
,
merge_request_params
).
execute
@merge_request
=
MergeRequests
::
CreateService
.
new
(
project
,
user
,
merge_request_params
).
execute
end
end
...
@@ -79,6 +80,7 @@ feature 'Pipelines for Merge Requests', js: true do
...
@@ -79,6 +80,7 @@ feature 'Pipelines for Merge Requests', js: true do
scenario
'user sees pipeline in merge request widget'
do
scenario
'user sees pipeline in merge request widget'
do
visit
project_merge_request_path
(
project
,
@merge_request
)
visit
project_merge_request_path
(
project
,
@merge_request
)
expect
(
page
.
find
(
".ci-widget"
)).
to
have_content
(
TestEnv
::
BRANCH_SHA
[
'feature'
])
expect
(
page
.
find
(
".ci-widget"
)).
to
have_content
(
TestEnv
::
BRANCH_SHA
[
'feature'
])
expect
(
page
.
find
(
".ci-widget"
)).
to
have_content
(
"#
#{
@pipeline
.
id
}
"
)
expect
(
page
.
find
(
".ci-widget"
)).
to
have_content
(
"#
#{
@pipeline
.
id
}
"
)
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