diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-11 00:06:24 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-11 00:06:24 +0000 |
| commit | 133924c6cc443f5f69e1ab08d43b363d77677cb0 (patch) | |
| tree | e893a7d36105fc4acec7038feae5f03bd34cfc2c /spec/javascripts/boards | |
| parent | f607152a0802a68067343ad73f989033cb8e9a06 (diff) | |
| download | gitlab-ce-133924c6cc443f5f69e1ab08d43b363d77677cb0.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/javascripts/boards')
| -rw-r--r-- | spec/javascripts/boards/issue_card_spec.js | 11 | ||||
| -rw-r--r-- | spec/javascripts/boards/mock_data.js | 4 |
2 files changed, 9 insertions, 6 deletions
diff --git a/spec/javascripts/boards/issue_card_spec.js b/spec/javascripts/boards/issue_card_spec.js index 9e99f961797..314e051665e 100644 --- a/spec/javascripts/boards/issue_card_spec.js +++ b/spec/javascripts/boards/issue_card_spec.js @@ -32,7 +32,10 @@ describe('Issue card component', () => { beforeEach(() => { setFixtures('<div class="test-container"></div>'); - list = listObj; + list = { + ...listObj, + type: 'label', + }; issue = new ListIssue({ title: 'Testing', id: 1, @@ -241,8 +244,8 @@ describe('Issue card component', () => { Vue.nextTick(() => done()); }); - it('renders list label', () => { - expect(component.$el.querySelectorAll('.badge').length).toBe(2); + it('does not render list label but renders all other labels', () => { + expect(component.$el.querySelectorAll('.badge').length).toBe(1); }); it('renders label', () => { @@ -278,7 +281,7 @@ describe('Issue card component', () => { Vue.nextTick() .then(() => { - expect(component.$el.querySelectorAll('.badge').length).toBe(2); + expect(component.$el.querySelectorAll('.badge').length).toBe(1); expect(component.$el.textContent).not.toContain('closed'); done(); diff --git a/spec/javascripts/boards/mock_data.js b/spec/javascripts/boards/mock_data.js index 50ad1442873..41b8f567e08 100644 --- a/spec/javascripts/boards/mock_data.js +++ b/spec/javascripts/boards/mock_data.js @@ -15,7 +15,7 @@ export const listObj = { weight: 3, label: { id: 5000, - title: 'Testing', + title: 'Test', color: 'red', description: 'testing;', textColor: 'white', @@ -30,7 +30,7 @@ export const listObjDuplicate = { weight: 3, label: { id: listObj.label.id, - title: 'Testing', + title: 'Test', color: 'red', description: 'testing;', }, |