diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2016-11-06 13:43:59 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2016-11-06 13:43:59 +0000 |
commit | f08fb38fc3192810834581c4750d27eca4b7f0f0 (patch) | |
tree | cf92290f19d705f524d6dc0fa6c60327bf5c5f4f | |
parent | 4feaa911550fa1710531b294fc2cdbfcf8998651 (diff) | |
download | gitlab-ce-ci-commit-component.tar.gz |
Updates testsci-commit-component
-rw-r--r-- | app/assets/javascripts/vue_common_components/commit.js.es6 | 6 | ||||
-rw-r--r-- | config/application.rb | 1 | ||||
-rw-r--r-- | spec/javascripts/vue_common_components/commit_spec.js.es6 | 29 |
3 files changed, 31 insertions, 5 deletions
diff --git a/app/assets/javascripts/vue_common_components/commit.js.es6 b/app/assets/javascripts/vue_common_components/commit.js.es6 index 71999225916..4d478220c61 100644 --- a/app/assets/javascripts/vue_common_components/commit.js.es6 +++ b/app/assets/javascripts/vue_common_components/commit.js.es6 @@ -1,5 +1,5 @@ -//= require vue - +/*= require vue +/* global Vue*/ (() => { window.gl = window.gl || {}; @@ -117,7 +117,7 @@ document.querySelector('.branch-commit .commit-icon-container').innerHtml = commitIconSVG; }, - template: ` + render: ` <div class="branch-commit"> <div v-if='hasRef'> <div class="icon-container"> diff --git a/config/application.rb b/config/application.rb index 946b632b0e8..0c65e36692c 100644 --- a/config/application.rb +++ b/config/application.rb @@ -99,6 +99,7 @@ module Gitlab config.assets.precompile << "lib/utils/*.js" config.assets.precompile << "lib/*.js" config.assets.precompile << "u2f.js" + config.assets.precompile << "vue_common_components/*.js.es6" # Version of your assets, change this if you want to expire all your assets config.assets.version = '1.0' diff --git a/spec/javascripts/vue_common_components/commit_spec.js.es6 b/spec/javascripts/vue_common_components/commit_spec.js.es6 index d71220e86ed..d5a2c5173bd 100644 --- a/spec/javascripts/vue_common_components/commit_spec.js.es6 +++ b/spec/javascripts/vue_common_components/commit_spec.js.es6 @@ -1,9 +1,34 @@ -//= require vue -/*= require ./vue_common_components/commit */ +/*= require vue_common_components/commit */ +/* eslint-disable */ describe('Commit component', () => { + const getRenderedText = (Component, propsData) => { + const Constructor = Vue.extend(Component); + const vm = new Constructor({propsData}).$mount(); + return vm.$el.textContent; + }; + + const MyComponent = window.gl.commitComponent; + describe('When `ref` is provided', () => { + const props = { + tag: true, + ref: { + name: 'master', + ref_url: 'http://localhost/namespace2/gitlabhq/tree/master' + }, + commit_url: 'https://gitlab.com/gitlab-org/gitlab-ce/commit/b7836eddf62d663c665769e1b0960197fd215067', + short_sha: 'b7836edd', + title: 'Commit message', + author: { + avatar_url: 'https://gitlab.com/uploads/user/avatar/300478/avatar.png', + web_url: 'https://gitlab.com/jschatz1', + username: 'jschatz1' + } + }; + it('should render a tag icon if it represents a tag', () => { + const renderedText = getRenderedText(MyComponent, props); }); |