summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-01-30 14:11:09 +0000
committerFatih Acet <acetfatih@gmail.com>2017-02-03 17:02:44 +0300
commit8323bc4919b9c13680fdc69e4ae25947b6ab0026 (patch)
treec3842433a2c29ecbbecfcb82d2a5fe78693f6ec8
parent274987d5c0f7b04a9b7510c318c8df6dfab477df (diff)
downloadgitlab-ce-8323bc4919b9c13680fdc69e4ae25947b6ab0026.tar.gz
Fixed up JS tests
-rw-r--r--app/assets/javascripts/boards/components/modal/header.js.es62
-rw-r--r--spec/javascripts/boards/boards_store_spec.js.es617
-rw-r--r--spec/javascripts/boards/issue_card_spec.js.es62
3 files changed, 3 insertions, 18 deletions
diff --git a/app/assets/javascripts/boards/components/modal/header.js.es6 b/app/assets/javascripts/boards/components/modal/header.js.es6
index ebb2ee1a82f..1b01a597874 100644
--- a/app/assets/javascripts/boards/components/modal/header.js.es6
+++ b/app/assets/javascripts/boards/components/modal/header.js.es6
@@ -21,7 +21,7 @@
this.$refs.selectAllBtn.blur();
ModalStore.toggleAll();
- }
+ },
},
components: {
'modal-tabs': gl.issueBoards.ModalTabs,
diff --git a/spec/javascripts/boards/boards_store_spec.js.es6 b/spec/javascripts/boards/boards_store_spec.js.es6
index 7c5850111cb..a0d434e3588 100644
--- a/spec/javascripts/boards/boards_store_spec.js.es6
+++ b/spec/javascripts/boards/boards_store_spec.js.es6
@@ -61,18 +61,6 @@ describe('Store', () => {
expect(list).toBeDefined();
});
- it('finds list limited by type', () => {
- gl.issueBoards.BoardsStore.addList({
- id: 1,
- position: 0,
- title: 'Test',
- list_type: 'backlog'
- });
- const list = gl.issueBoards.BoardsStore.findList('id', 1, 'backlog');
-
- expect(list).toBeDefined();
- });
-
it('gets issue when new list added', (done) => {
gl.issueBoards.BoardsStore.addList(listObj);
const list = gl.issueBoards.BoardsStore.findList('id', 1);
@@ -117,10 +105,7 @@ describe('Store', () => {
expect(gl.issueBoards.BoardsStore.shouldAddBlankState()).toBe(false);
});
- it('check for blank state adding when backlog & done list exist', () => {
- gl.issueBoards.BoardsStore.addList({
- list_type: 'backlog'
- });
+ it('check for blank state adding when done list exist', () => {
gl.issueBoards.BoardsStore.addList({
list_type: 'done'
});
diff --git a/spec/javascripts/boards/issue_card_spec.js.es6 b/spec/javascripts/boards/issue_card_spec.js.es6
index 181fb684c23..d68108c6f6f 100644
--- a/spec/javascripts/boards/issue_card_spec.js.es6
+++ b/spec/javascripts/boards/issue_card_spec.js.es6
@@ -93,7 +93,7 @@ describe('Issue card component', () => {
setTimeout(() => {
expect(
- component.$el.querySelector('.fa-eye-flash'),
+ component.$el.querySelector('.confidential-icon'),
).not.toBeNull();
done();
}, 0);