diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-12-22 18:43:51 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-12-22 18:43:51 +0000 |
| commit | 8e434f0006affd2359e3dfaa4c10568f7378d91a (patch) | |
| tree | 70521b5f89ccff1c9bbeebf030fd30503db429d1 /spec/javascripts/vue_shared | |
| parent | 17136f702a17e5a42268fd76796579ee95914b28 (diff) | |
| parent | 46be07d2c1da93cffd59fb03036e357c04ff6f3b (diff) | |
| download | gitlab-ce-8e434f0006affd2359e3dfaa4c10568f7378d91a.tar.gz | |
Merge branch 'master' into 22643-manual-job-page
* master: (22 commits)
Extend Cluster Applications to allow installation of Prometheus
Docs: move article LDAP-CE to its topic-related folder
Improve performance of DiffDiscussion#truncated_diff_lines and DiffNote#diff_line by removing expensive diff position calculation and comparison
Reverted fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15788
Execute project hooks and services after commit when moving an issue
Use relative URLs when linking to uploaded files
Use gitlab-styles
Clarify Auto DevOps pipelines
Make webpack fail for missing exports
Update VERSION to 10.4.0-pre
Update CHANGELOG.md for 10.3.0
Explictly require Gitlab::Utils in ProjectFeaturesCompatibility
Add note about using the term GPG for all related implementations
Add index on namespaces lower(name) for UsersController#exists
docs: fix a typo in LFS documentation
Fix prometheus arg in prometheus.yml
Update Dependencies
It should escape spaces to %20 rather than +
Replaced the remaining code-fork icons
code-fork replacements
...
Diffstat (limited to 'spec/javascripts/vue_shared')
| -rw-r--r-- | spec/javascripts/vue_shared/components/commit_spec.js | 4 |
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', () => { |