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
3d7b3300
Commit
3d7b3300
authored
Sep 06, 2019
by
Winnie Hellmann
Committed by
Lin Jen-Shin
Sep 06, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Merge branch 'winh-fix-flaky-dashboard_spec' into 'master'"
This reverts merge request !32571
parent
222d9e62
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
194 additions
and
190 deletions
+194
-190
spec/frontend/environment.js
spec/frontend/environment.js
+0
-1
spec/frontend/test_setup.js
spec/frontend/test_setup.js
+0
-3
spec/javascripts/monitoring/components/dashboard_spec.js
spec/javascripts/monitoring/components/dashboard_spec.js
+194
-186
No files found.
spec/frontend/environment.js
View file @
3d7b3300
...
...
@@ -40,7 +40,6 @@ class CustomEnvironment extends JSDOMEnvironment {
this
.
global
.
fixturesBasePath
=
`
${
ROOT_PATH
}
/tmp/tests/frontend/fixtures
${
IS_EE
?
'
-ee
'
:
''
}
`
;
this
.
global
.
staticFixturesBasePath
=
`
${
ROOT_PATH
}
/spec/frontend/fixtures`
;
this
.
global
.
IS_EE
=
IS_EE
;
// Not yet supported by JSDOM: https://github.com/jsdom/jsdom/issues/317
this
.
global
.
document
.
createRange
=
()
=>
({
...
...
spec/frontend/test_setup.js
View file @
3d7b3300
...
...
@@ -73,9 +73,6 @@ expect.extend(customMatchers);
// Tech debt issue TBD
testUtilsConfig
.
logModifiedComponents
=
false
;
// Stub for URL.createObjectURL
window
.
URL
.
createObjectURL
=
function
createObjectURL
()
{};
// Basic stub for MutationObserver
global
.
MutationObserver
=
()
=>
({
disconnect
:
()
=>
{},
...
...
spec/
frontend
/monitoring/components/dashboard_spec.js
→
spec/
javascripts
/monitoring/components/dashboard_spec.js
View file @
3d7b3300
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