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
d7623d54
Commit
d7623d54
authored
Jan 10, 2020
by
Illya Klymov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace localVue.set with setData
parent
eb64d772
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
4 deletions
+2
-4
ee/spec/frontend/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js
...widget/components/states/mr_widget_ready_to_merge_spec.js
+2
-4
No files found.
ee/spec/frontend/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js
View file @
d7623d54
import
{
shallowMount
,
createLocalVue
}
from
'
@vue/test-utils
'
;
import
{
shallowMount
}
from
'
@vue/test-utils
'
;
import
{
MERGE_DISABLED_TEXT_UNAPPROVED
}
from
'
ee/vue_merge_request_widget/mixins/ready_to_merge
'
;
import
{
MERGE_DISABLED_TEXT_UNAPPROVED
}
from
'
ee/vue_merge_request_widget/mixins/ready_to_merge
'
;
import
MergeImmediatelyConfirmationDialog
from
'
ee/vue_merge_request_widget/components/merge_immediately_confirmation_dialog.vue
'
;
import
MergeImmediatelyConfirmationDialog
from
'
ee/vue_merge_request_widget/components/merge_immediately_confirmation_dialog.vue
'
;
import
ReadyToMerge
from
'
~/vue_merge_request_widget/components/states/ready_to_merge.vue
'
;
import
ReadyToMerge
from
'
~/vue_merge_request_widget/components/states/ready_to_merge.vue
'
;
...
@@ -10,7 +10,6 @@ import {
...
@@ -10,7 +10,6 @@ import {
import
{
MERGE_DISABLED_TEXT
}
from
'
~/vue_merge_request_widget/mixins/ready_to_merge
'
;
import
{
MERGE_DISABLED_TEXT
}
from
'
~/vue_merge_request_widget/mixins/ready_to_merge
'
;
describe
(
'
ReadyToMerge
'
,
()
=>
{
describe
(
'
ReadyToMerge
'
,
()
=>
{
const
localVue
=
createLocalVue
();
let
wrapper
;
let
wrapper
;
let
vm
;
let
vm
;
...
@@ -48,7 +47,6 @@ describe('ReadyToMerge', () => {
...
@@ -48,7 +47,6 @@ describe('ReadyToMerge', () => {
mr
:
{
...
mr
,
...
mrUpdates
},
mr
:
{
...
mr
,
...
mrUpdates
},
service
,
service
,
},
},
localVue
,
stubs
:
{
stubs
:
{
MergeImmediatelyConfirmationDialog
,
MergeImmediatelyConfirmationDialog
,
},
},
...
@@ -76,7 +74,7 @@ describe('ReadyToMerge', () => {
...
@@ -76,7 +74,7 @@ describe('ReadyToMerge', () => {
it
(
'
should return "Merge in progress"
'
,
()
=>
{
it
(
'
should return "Merge in progress"
'
,
()
=>
{
factory
();
factory
();
localVue
.
set
(
vm
,
'
isMergingImmediately
'
,
true
);
wrapper
.
setData
({
isMergingImmediately
:
true
}
);
expect
(
vm
.
mergeButtonText
).
toEqual
(
'
Merge in progress
'
);
expect
(
vm
.
mergeButtonText
).
toEqual
(
'
Merge in progress
'
);
});
});
...
...
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