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
ac226c69
Commit
ac226c69
authored
Oct 04, 2019
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'clean-up-ff-class' into 'master'
Remove unused `js-` class See merge request gitlab-org/gitlab!18043
parents
d4840519
6c9bab5c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
app/assets/javascripts/vue_merge_request_widget/components/deployment.vue
...cripts/vue_merge_request_widget/components/deployment.vue
+1
-1
spec/javascripts/vue_mr_widget/components/deployment_spec.js
spec/javascripts/vue_mr_widget/components/deployment_spec.js
+3
-3
No files found.
app/assets/javascripts/vue_merge_request_widget/components/deployment.vue
View file @
ac226c69
...
...
@@ -211,7 +211,7 @@ export default {
<
template
v-else
>
<review-app-link
:link=
"deploymentExternalUrl"
css-class=
"js-deploy-url
js-deploy-url-feature-flag
deploy-link btn btn-default btn-sm inline"
css-class=
"js-deploy-url deploy-link btn btn-default btn-sm inline"
/>
</
template
>
<visual-review-app-link
...
...
spec/javascripts/vue_mr_widget/components/deployment_spec.js
View file @
ac226c69
...
...
@@ -207,7 +207,7 @@ describe('Deployment component', () => {
it
(
'
renders the link to the review app without dropdown
'
,
()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.js-mr-wigdet-deployment-dropdown
'
)).
toBeNull
();
expect
(
vm
.
$el
.
querySelector
(
'
.js-deploy-url
-feature-flag
'
)).
not
.
toBeNull
();
expect
(
vm
.
$el
.
querySelector
(
'
.js-deploy-url
'
)).
not
.
toBeNull
();
});
});
...
...
@@ -223,12 +223,12 @@ describe('Deployment component', () => {
it
(
'
renders the link to the review app without dropdown
'
,
()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.js-mr-wigdet-deployment-dropdown
'
)).
toBeNull
();
expect
(
vm
.
$el
.
querySelector
(
'
.js-deploy-url
-feature-flag
'
)).
not
.
toBeNull
();
expect
(
vm
.
$el
.
querySelector
(
'
.js-deploy-url
'
)).
not
.
toBeNull
();
});
it
(
'
renders the link to the review app linked to to the first change
'
,
()
=>
{
const
expectedUrl
=
deploymentMockData
.
changes
[
0
].
external_url
;
const
deployUrl
=
vm
.
$el
.
querySelector
(
'
.js-deploy-url
-feature-flag
'
);
const
deployUrl
=
vm
.
$el
.
querySelector
(
'
.js-deploy-url
'
);
expect
(
vm
.
$el
.
querySelector
(
'
.js-mr-wigdet-deployment-dropdown
'
)).
toBeNull
();
expect
(
deployUrl
).
not
.
toBeNull
();
...
...
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