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
Boxiang Sun
gitlab-ce
Commits
f2c23ab8
Commit
f2c23ab8
authored
Sep 20, 2017
by
Eric Eastwood
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use new shared Vue mountComponent method
parent
5fd3ec1c
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
15 deletions
+5
-15
spec/javascripts/vue_mr_widget/components/states/mr_widget_conflicts_spec.js
...e_mr_widget/components/states/mr_widget_conflicts_spec.js
+5
-15
No files found.
spec/javascripts/vue_mr_widget/components/states/mr_widget_conflicts_spec.js
View file @
f2c23ab8
import
Vue
from
'
vue
'
;
import
conflictsComponent
from
'
~/vue_merge_request_widget/components/states/mr_widget_conflicts
'
;
import
mountComponent
from
'
../../../helpers/vue_mount_component_helper
'
;
const
ConflictsComponent
=
Vue
.
extend
(
conflictsComponent
);
const
path
=
'
/conflicts
'
;
const
createComponent
=
(
customConfig
=
{})
=>
{
const
Component
=
Vue
.
extend
(
conflictsComponent
);
const
config
=
Object
.
assign
({
mr
:
{},
},
customConfig
);
return
new
Component
({
el
:
document
.
createElement
(
'
div
'
),
propsData
:
config
,
});
};
describe
(
'
MRWidgetConflicts
'
,
()
=>
{
describe
(
'
props
'
,
()
=>
{
...
...
@@ -30,7 +20,7 @@ describe('MRWidgetConflicts', () => {
let
vm
;
beforeEach
(()
=>
{
vm
=
createComponent
(
{
vm
=
mountComponent
(
ConflictsComponent
,
{
mr
:
{
canMerge
:
true
,
conflictResolutionPath
:
path
,
...
...
@@ -65,7 +55,7 @@ describe('MRWidgetConflicts', () => {
let
vm
;
beforeEach
(()
=>
{
vm
=
createComponent
(
{
vm
=
mountComponent
(
ConflictsComponent
,
{
mr
:
{
canMerge
:
false
,
},
...
...
@@ -87,7 +77,7 @@ describe('MRWidgetConflicts', () => {
let
vm
;
beforeEach
(()
=>
{
vm
=
createComponent
(
{
vm
=
mountComponent
(
ConflictsComponent
,
{
mr
:
{
ffOnlyEnabled
:
true
,
},
...
...
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