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
ede97703
Commit
ede97703
authored
May 29, 2019
by
Heinrich Lee Yu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Increase global karma timeout
Revert useless timeout added in karma spec
parent
54dbaba5
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
spec/javascripts/notes/components/note_app_spec.js
spec/javascripts/notes/components/note_app_spec.js
+2
-2
spec/javascripts/test_bundle.js
spec/javascripts/test_bundle.js
+1
-1
No files found.
spec/javascripts/notes/components/note_app_spec.js
View file @
ede97703
...
@@ -195,7 +195,7 @@ describe('note_app', () => {
...
@@ -195,7 +195,7 @@ describe('note_app', () => {
setTimeout
(()
=>
{
setTimeout
(()
=>
{
done
();
done
();
});
});
}
,
2000
);
});
});
});
describe
(
'
discussion note
'
,
()
=>
{
describe
(
'
discussion note
'
,
()
=>
{
...
@@ -230,7 +230,7 @@ describe('note_app', () => {
...
@@ -230,7 +230,7 @@ describe('note_app', () => {
setTimeout
(()
=>
{
setTimeout
(()
=>
{
done
();
done
();
});
});
}
,
2000
);
});
});
});
});
});
...
...
spec/javascripts/test_bundle.js
View file @
ede97703
...
@@ -111,7 +111,7 @@ let longRunningTestTimeoutHandle;
...
@@ -111,7 +111,7 @@ let longRunningTestTimeoutHandle;
beforeEach
(
done
=>
{
beforeEach
(
done
=>
{
longRunningTestTimeoutHandle
=
setTimeout
(()
=>
{
longRunningTestTimeoutHandle
=
setTimeout
(()
=>
{
done
.
fail
(
'
Test is running too long!
'
);
done
.
fail
(
'
Test is running too long!
'
);
},
2
000
);
},
4
000
);
done
();
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