BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
7ea9c5ce
Commit
7ea9c5ce
authored
May 25, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix-raven-jquery-dep' into 'master'
Use non-global jQuery reference within raven bundle Closes #32662 See merge request !11581
parents
ec2130be
710e3537
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
19 deletions
+2
-19
raven_config.js
app/assets/javascripts/raven/raven_config.js
+2
-1
raven_config_spec.js
spec/javascripts/raven/raven_config_spec.js
+0
-18
No files found.
app/assets/javascripts/raven/raven_config.js
View file @
7ea9c5ce
import
Raven
from
'raven-js'
;
import
$
from
'jquery'
;
const
IGNORE_ERRORS
=
[
// Random plugins/extensions
...
...
@@ -74,7 +75,7 @@ const RavenConfig = {
},
bindRavenErrors
()
{
window
.
$
(
document
).
on
(
'ajaxError.raven'
,
this
.
handleRavenErrors
);
$
(
document
).
on
(
'ajaxError.raven'
,
this
.
handleRavenErrors
);
},
handleRavenErrors
(
event
,
req
,
config
,
err
)
{
...
...
spec/javascripts/raven/raven_config_spec.js
View file @
7ea9c5ce
...
...
@@ -140,24 +140,6 @@ describe('RavenConfig', () => {
});
});
describe
(
'bindRavenErrors'
,
()
=>
{
let
$document
;
let
$
;
beforeEach
(()
=>
{
$document
=
jasmine
.
createSpyObj
(
'$document'
,
[
'on'
]);
$
=
jasmine
.
createSpy
(
'$'
).
and
.
returnValue
(
$document
);
window
.
$
=
$
;
RavenConfig
.
bindRavenErrors
();
});
it
(
'should call .on'
,
function
()
{
expect
(
$document
.
on
).
toHaveBeenCalledWith
(
'ajaxError.raven'
,
RavenConfig
.
handleRavenErrors
);
});
});
describe
(
'handleRavenErrors'
,
()
=>
{
let
event
;
let
req
;
...
...
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