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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
64ae4689
Commit
64ae4689
authored
Mar 07, 2017
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add feature specs for new MR widget blocked state
parent
152c2b5b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
26 additions
and
1 deletion
+26
-1
spec/features/merge_requests/widget_spec.rb
spec/features/merge_requests/widget_spec.rb
+26
-1
No files found.
spec/features/merge_requests/widget_spec.rb
View file @
64ae4689
...
@@ -37,7 +37,12 @@ describe 'Merge request', :feature, :js do
...
@@ -37,7 +37,12 @@ describe 'Merge request', :feature, :js do
context
'view merge request'
do
context
'view merge request'
do
let!
(
:environment
)
{
create
(
:environment
,
project:
project
)
}
let!
(
:environment
)
{
create
(
:environment
,
project:
project
)
}
let!
(
:deployment
)
{
create
(
:deployment
,
environment:
environment
,
ref:
'feature'
,
sha:
merge_request
.
diff_head_sha
)
}
let!
(
:deployment
)
do
create
(
:deployment
,
environment:
environment
,
ref:
'feature'
,
sha:
merge_request
.
diff_head_sha
)
end
before
do
before
do
visit
namespace_project_merge_request_path
(
project
.
namespace
,
project
,
merge_request
)
visit
namespace_project_merge_request_path
(
project
.
namespace
,
project
,
merge_request
)
...
@@ -96,6 +101,26 @@ describe 'Merge request', :feature, :js do
...
@@ -96,6 +101,26 @@ describe 'Merge request', :feature, :js do
end
end
end
end
context
'when merge request is in the blocked pipeline state'
do
before
do
create
(
:ci_pipeline
,
project:
project
,
sha:
merge_request
.
diff_head_sha
,
ref:
merge_request
.
source_branch
,
status: :manual
)
visit
namespace_project_merge_request_path
(
project
.
namespace
,
project
,
merge_request
)
end
it
'shows information about blocked pipeline'
do
expect
(
page
).
to
have_content
(
"Pipeline blocked"
)
expect
(
page
).
to
have_content
(
"The pipeline for this merge request requires a manual action"
)
expect
(
page
).
to
have_css
(
'.ci-status-icon-manual'
)
end
end
context
'view merge request with MWBS button'
do
context
'view merge request with MWBS button'
do
before
do
before
do
commit_status
=
create
(
:commit_status
,
project:
project
,
status:
'pending'
)
commit_status
=
create
(
:commit_status
,
project:
project
,
status:
'pending'
)
...
...
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