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
73dc529b
Commit
73dc529b
authored
Jan 16, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed merge request specs
parent
d53aea6b
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
spec/javascripts/merge_request_spec.js
spec/javascripts/merge_request_spec.js
+2
-2
No files found.
spec/javascripts/merge_request_spec.js
View file @
73dc529b
...
@@ -70,6 +70,7 @@ import IssuablesHelper from '~/helpers/issuables_helper';
...
@@ -70,6 +70,7 @@ import IssuablesHelper from '~/helpers/issuables_helper';
beforeEach
(()
=>
{
beforeEach
(()
=>
{
loadFixtures
(
'
merge_requests/merge_request_with_task_list.html.raw
'
);
loadFixtures
(
'
merge_requests/merge_request_with_task_list.html.raw
'
);
this
.
el
=
document
.
querySelector
(
'
.js-issuable-actions
'
);
this
.
el
=
document
.
querySelector
(
'
.js-issuable-actions
'
);
new
MergeRequest
();
// eslint-disable-line no-new
MergeRequest
.
hideCloseButton
();
MergeRequest
.
hideCloseButton
();
});
});
...
@@ -89,8 +90,7 @@ import IssuablesHelper from '~/helpers/issuables_helper';
...
@@ -89,8 +90,7 @@ import IssuablesHelper from '~/helpers/issuables_helper';
beforeEach
(()
=>
{
beforeEach
(()
=>
{
loadFixtures
(
'
merge_requests/merge_request_of_current_user.html.raw
'
);
loadFixtures
(
'
merge_requests/merge_request_of_current_user.html.raw
'
);
this
.
el
=
document
.
querySelector
(
'
.js-issuable-actions
'
);
this
.
el
=
document
.
querySelector
(
'
.js-issuable-actions
'
);
const
merge
=
new
MergeRequest
();
MergeRequest
.
hideCloseButton
();
merge
.
hideCloseButton
();
});
});
it
(
'
hides the close button
'
,
()
=>
{
it
(
'
hides the close button
'
,
()
=>
{
...
...
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