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
fd16c892
Commit
fd16c892
authored
Apr 07, 2017
by
Jacob Schatz
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'karma-failure-fix' into 'master'
Fixed duplicate jQuery AJAX spyon See merge request !10531
parents
8631779b
ac355664
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
7 deletions
+6
-7
app/assets/javascripts/merge_request_tabs.js
app/assets/javascripts/merge_request_tabs.js
+3
-3
spec/javascripts/merge_request_tabs_spec.js
spec/javascripts/merge_request_tabs_spec.js
+3
-4
No files found.
app/assets/javascripts/merge_request_tabs.js
View file @
fd16c892
...
@@ -102,10 +102,10 @@ import './flash';
...
@@ -102,10 +102,10 @@ import './flash';
destroyPipelinesView
()
{
destroyPipelinesView
()
{
if
(
this
.
commitPipelinesTable
)
{
if
(
this
.
commitPipelinesTable
)
{
document
.
querySelector
(
'
#commit-pipeline-table-view
'
)
.
removeChild
(
this
.
commitPipelinesTable
.
$el
);
this
.
commitPipelinesTable
.
$destroy
();
this
.
commitPipelinesTable
.
$destroy
();
this
.
commitPipelinesTable
=
null
;
document
.
querySelector
(
'
#commit-pipeline-table-view
'
).
innerHTML
=
''
;
}
}
}
}
...
...
spec/javascripts/merge_request_tabs_spec.js
View file @
fd16c892
...
@@ -222,7 +222,9 @@ require('vendor/jquery.scrollTo');
...
@@ -222,7 +222,9 @@ require('vendor/jquery.scrollTo');
describe
(
'
#tabShown
'
,
()
=>
{
describe
(
'
#tabShown
'
,
()
=>
{
beforeEach
(
function
()
{
beforeEach
(
function
()
{
spyOn
(
$
,
'
ajax
'
).
and
.
callFake
(
function
()
{});
spyOn
(
$
,
'
ajax
'
).
and
.
callFake
(
function
(
options
)
{
options
.
success
({
html
:
''
});
});
loadFixtures
(
'
merge_requests/merge_request_with_task_list.html.raw
'
);
loadFixtures
(
'
merge_requests/merge_request_with_task_list.html.raw
'
);
});
});
...
@@ -230,9 +232,6 @@ require('vendor/jquery.scrollTo');
...
@@ -230,9 +232,6 @@ require('vendor/jquery.scrollTo');
beforeEach
(
function
()
{
beforeEach
(
function
()
{
this
.
class
.
diffViewType
=
()
=>
'
parallel
'
;
this
.
class
.
diffViewType
=
()
=>
'
parallel
'
;
gl
.
Diff
.
prototype
.
diffViewType
=
()
=>
'
parallel
'
;
gl
.
Diff
.
prototype
.
diffViewType
=
()
=>
'
parallel
'
;
spyOn
(
$
,
'
ajax
'
).
and
.
callFake
(
function
(
options
)
{
options
.
success
({
html
:
''
});
});
});
});
it
(
'
maintains `container-limited` for pipelines tab
'
,
function
(
done
)
{
it
(
'
maintains `container-limited` for pipelines tab
'
,
function
(
done
)
{
...
...
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