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
955d684c
Commit
955d684c
authored
Aug 21, 2017
by
Tim Zallmann
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '36517-failing-karma-tests-for-chrome-60' into 'master'
Resolve "Failing karma tests for Chrome 60" Closes #36517 See merge request !13646
parents
9279bf23
907d7410
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
3 deletions
+8
-3
.gitlab-ci.yml
.gitlab-ci.yml
+1
-1
board_new_issue_spec.js
spec/javascripts/boards/board_new_issue_spec.js
+6
-2
text_utility_spec.js
spec/javascripts/lib/utils/text_utility_spec.js
+1
-0
No files found.
.gitlab-ci.yml
View file @
955d684c
...
...
@@ -522,7 +522,7 @@ karma:
<<
:
*dedicated-runner
<<
:
*except-docs
<<
:
*pull-cache
image
:
"
dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.3.3-golang-1.8-git-2.13-chrome-
59
.0-node-7.1-postgresql-9.6"
image
:
"
dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.3.3-golang-1.8-git-2.13-chrome-
60
.0-node-7.1-postgresql-9.6"
stage
:
test
variables
:
BABEL_ENV
:
"
coverage"
...
...
spec/javascripts/boards/board_new_issue_spec.js
View file @
955d684c
...
...
@@ -30,6 +30,8 @@ describe('Issue boards new issue form', () => {
};
beforeEach
((
done
)
=>
{
setFixtures
(
'<div class="test-container"></div>'
);
const
BoardNewIssueComp
=
Vue
.
extend
(
boardNewIssue
);
Vue
.
http
.
interceptors
.
push
(
boardsMockInterceptor
);
...
...
@@ -46,15 +48,17 @@ describe('Issue boards new issue form', () => {
propsData
:
{
list
,
},
}).
$mount
();
}).
$mount
(
document
.
querySelector
(
'.test-container'
)
);
Vue
.
nextTick
()
.
then
(
done
)
.
catch
(
done
.
fail
);
});
afterEach
(()
=>
vm
.
$destroy
());
it
(
'calls submit if submit button is clicked'
,
(
done
)
=>
{
spyOn
(
vm
,
'submit'
);
spyOn
(
vm
,
'submit'
)
.
and
.
callFake
(
e
=>
e
.
preventDefault
())
;
vm
.
title
=
'Testing Title'
;
Vue
.
nextTick
()
...
...
spec/javascripts/lib/utils/text_utility_spec.js
View file @
955d684c
...
...
@@ -52,6 +52,7 @@ describe('text_utility', () => {
beforeAll
(()
=>
{
textArea
=
document
.
createElement
(
'textarea'
);
document
.
querySelector
(
'body'
).
appendChild
(
textArea
);
textArea
.
focus
();
});
afterAll
(()
=>
{
...
...
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