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
f92f6aff
Commit
f92f6aff
authored
5 years ago
by
Lee Tickett
Committed by
Phil Hughes
5 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove var from merge request tabs spec js
parent
a92540aa
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
8 deletions
+11
-8
changelogs/unreleased/remove_var_from_merge_request_tabs_spec_js.yml
...unreleased/remove_var_from_merge_request_tabs_spec_js.yml
+5
-0
spec/javascripts/merge_request_tabs_spec.js
spec/javascripts/merge_request_tabs_spec.js
+6
-8
No files found.
changelogs/unreleased/remove_var_from_merge_request_tabs_spec_js.yml
0 → 100644
View file @
f92f6aff
---
title
:
Remove var from merge_request_tabs_spec.js
merge_request
:
20087
author
:
Lee Tickett
type
:
other
This diff is collapsed.
Click to expand it.
spec/javascripts/merge_request_tabs_spec.js
View file @
f92f6aff
/* eslint-disable no-var */
import
$
from
'
jquery
'
;
import
MockAdapter
from
'
axios-mock-adapter
'
;
import
axios
from
'
~/lib/utils/axios_utils
'
;
...
...
@@ -11,9 +10,9 @@ import initMrPage from './helpers/init_vue_mr_page_helper';
describe
(
'
MergeRequestTabs
'
,
function
()
{
let
mrPageMock
;
var
stubLocation
=
{};
var
setLocation
=
function
(
stubs
)
{
var
defaults
=
{
const
stubLocation
=
{};
const
setLocation
=
function
(
stubs
)
{
const
defaults
=
{
pathname
:
''
,
search
:
''
,
hash
:
''
,
...
...
@@ -44,9 +43,9 @@ describe('MergeRequestTabs', function() {
});
describe
(
'
opensInNewTab
'
,
function
()
{
var
tabUrl
;
var
windowTarget
=
'
_blank
'
;
const
windowTarget
=
'
_blank
'
;
let
clickTabParams
;
let
tabUrl
;
beforeEach
(
function
()
{
loadFixtures
(
'
merge_requests/merge_request_with_task_list.html
'
);
...
...
@@ -193,11 +192,10 @@ describe('MergeRequestTabs', function() {
});
it
(
'
replaces the current history state
'
,
function
()
{
var
newState
;
setLocation
({
pathname
:
'
/foo/bar/merge_requests/1
'
,
});
newState
=
this
.
subject
(
'
commits
'
);
const
newState
=
this
.
subject
(
'
commits
'
);
expect
(
this
.
spies
.
history
).
toHaveBeenCalledWith
(
{
...
...
This diff is collapsed.
Click to expand it.
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