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
36407de5
Commit
36407de5
authored
Jun 26, 2019
by
Sarah Groff Hennigh-Palermo
Committed by
Clement Ho
Jun 26, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Visual Review: Fix the typo preventing the button from displaying
parent
c55b6d93
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
54 additions
and
1 deletion
+54
-1
ee/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
...cripts/vue_merge_request_widget/stores/mr_widget_store.js
+1
-1
ee/spec/features/merge_request/user_sees_deployment_widget_spec.rb
...eatures/merge_request/user_sees_deployment_widget_spec.rb
+53
-0
No files found.
ee/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
View file @
36407de5
...
...
@@ -31,7 +31,7 @@ export default class MergeRequestStore extends CEMergeRequestStore {
this
.
canDismissVulnerability
=
Boolean
(
this
.
createVulnerabilityFeedbackDismissalPath
);
this
.
canCreateFeedback
=
data
.
can_create_feedback
||
false
;
this
.
visualReviewAppAvailable
=
data
.
visual_review_app_available
;
this
.
visualReviewFF
=
gon
&&
gon
.
featues
&&
gon
.
features
.
visualReviewApp
;
this
.
visualReviewFF
=
gon
&&
gon
.
featu
r
es
&&
gon
.
features
.
visualReviewApp
;
this
.
appUrl
=
gon
&&
gon
.
gitlab_url
;
this
.
initCodeclimate
(
data
);
...
...
ee/spec/features/merge_request/user_sees_deployment_widget_spec.rb
0 → 100644
View file @
36407de5
# frozen_string_literal: true
require
'rails_helper'
describe
'Merge request > User sees deployment widget'
,
:js
do
describe
'when merge request has associated environments'
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:project
,
:repository
)
}
let
(
:merge_request
)
{
create
(
:merge_request
,
:merged
,
source_project:
project
)
}
let
(
:environment
)
{
create
(
:environment
,
project:
project
)
}
let
(
:role
)
{
:developer
}
let
(
:ref
)
{
merge_request
.
target_branch
}
let
(
:sha
)
{
project
.
commit
(
ref
).
id
}
let
(
:pipeline
)
{
create
(
:ci_pipeline_without_jobs
,
sha:
sha
,
project:
project
,
ref:
ref
)
}
let!
(
:manual
)
{
}
before
do
merge_request
.
update!
(
merge_commit_sha:
sha
)
project
.
add_user
(
user
,
role
)
sign_in
(
user
)
end
context
'when deployment succeeded'
do
let
(
:build
)
{
create
(
:ci_build
,
:success
,
pipeline:
pipeline
)
}
let!
(
:deployment
)
{
create
(
:deployment
,
:succeed
,
environment:
environment
,
sha:
sha
,
ref:
ref
,
deployable:
build
)
}
context
'when the license flag is enabled'
do
before
do
stub_licensed_features
(
visual_review_app:
true
)
end
it
'displays the visual review button'
do
visit
project_merge_request_path
(
project
,
merge_request
)
wait_for_requests
expect
(
page
).
to
have_selector
(
'.js-review-button'
)
end
end
context
'when the license flag is disabled'
do
before
do
stub_licensed_features
(
visual_review_app:
false
)
end
it
'does not display the button'
do
visit
project_merge_request_path
(
project
,
merge_request
)
wait_for_requests
expect
(
page
).
not_to
have_selector
(
'.js-review-button'
)
end
end
end
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