summaryrefslogtreecommitdiff
path: root/spec/javascripts/vue_shared
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2017-12-22 10:59:48 +0000
committerTim Zallmann <tzallmann@gitlab.com>2017-12-22 10:59:48 +0000
commitc88594446cbafc9917290cb778cdce6d7cd330a3 (patch)
tree94eb8925d705ffaa39ec32b65f7a0a6a03d30a20 /spec/javascripts/vue_shared
parent692b2d7e57baf15829724165c2a58dca39db1376 (diff)
parent5bbc322bd383adccf997b945abe7f07759b70013 (diff)
downloadgitlab-ce-c88594446cbafc9917290cb778cdce6d7cd330a3.tar.gz
Merge branch 'jivl-general-icons-2' into 'master'
Replace the download, fork and resolve discussion in a new issue icons See merge request gitlab-org/gitlab-ce!15436
Diffstat (limited to 'spec/javascripts/vue_shared')
-rw-r--r--spec/javascripts/vue_shared/components/commit_spec.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/javascripts/vue_shared/components/commit_spec.js b/spec/javascripts/vue_shared/components/commit_spec.js
index d5754aaa9e7..fdead874209 100644
--- a/spec/javascripts/vue_shared/components/commit_spec.js
+++ b/spec/javascripts/vue_shared/components/commit_spec.js
@@ -10,7 +10,7 @@ describe('Commit component', () => {
CommitComponent = Vue.extend(commitComp);
});
- it('should render a code-fork icon if it does not represent a tag', () => {
+ it('should render a fork icon if it does not represent a tag', () => {
component = new CommitComponent({
propsData: {
tag: false,
@@ -30,7 +30,7 @@ describe('Commit component', () => {
},
}).$mount();
- expect(component.$el.querySelector('.icon-container i').classList).toContain('fa-code-fork');
+ expect(component.$el.querySelector('.icon-container').children).toContain('svg');
});
describe('Given all the props', () => {