diff options
author | Phil Hughes <me@iamphill.com> | 2019-03-13 17:45:20 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2019-03-13 17:45:20 +0000 |
commit | 7ded65c6fe1a0700c695d2110e575861106a00da (patch) | |
tree | 515c6ad45627f484b334f1dd04f08867e78627b1 | |
parent | ff26347d5e52a4c0b1d3ae690df1529bb8d7b5a1 (diff) | |
parent | c829c1c4a9dc6bc327c08eed90e20c4fb6c2410d (diff) | |
download | gitlab-ce-7ded65c6fe1a0700c695d2110e575861106a00da.tar.gz |
Merge branch '10026-folder-ee' into 'master'
Removes EE differences for folder_view
Closes gitlab-ee#10026
See merge request gitlab-org/gitlab-ce!26053
3 files changed, 49 insertions, 5 deletions
diff --git a/app/assets/javascripts/environments/folder/environments_folder_view.vue b/app/assets/javascripts/environments/folder/environments_folder_view.vue index 80f0e00400b..6fd0561f682 100644 --- a/app/assets/javascripts/environments/folder/environments_folder_view.vue +++ b/app/assets/javascripts/environments/folder/environments_folder_view.vue @@ -1,4 +1,5 @@ <script> +import folderMixin from 'ee_else_ce/environments/mixins/environments_folder_view_mixin'; import environmentsMixin from '../mixins/environments_mixin'; import CIPaginationMixin from '../../vue_shared/mixins/ci_pagination_api_mixin'; import StopEnvironmentModal from '../components/stop_environment_modal.vue'; @@ -8,7 +9,7 @@ export default { StopEnvironmentModal, }, - mixins: [environmentsMixin, CIPaginationMixin], + mixins: [environmentsMixin, CIPaginationMixin, folderMixin], props: { endpoint: { @@ -41,7 +42,8 @@ export default { <div v-if="!isLoading" class="top-area"> <h4 class="js-folder-name environments-folder-name"> - {{ s__('Environments|Environments') }} / <b>{{ folderName }}</b> + {{ s__('Environments|Environments') }} / + <b>{{ folderName }}</b> </h4> <tabs :tabs="tabs" scope="environments" @onChangeTab="onChangeTab" /> @@ -52,6 +54,11 @@ export default { :environments="state.environments" :pagination="state.paginationInformation" :can-read-environment="canReadEnvironment" + :canary-deployment-feature-id="canaryDeploymentFeatureId" + :show-canary-deployment-callout="showCanaryDeploymentCallout" + :user-callouts-path="userCalloutsPath" + :lock-promotion-svg-path="lockPromotionSvgPath" + :help-canary-deployments-path="helpCanaryDeploymentsPath" @onChangePage="onChangePage" /> </div> diff --git a/app/assets/javascripts/environments/mixins/environments_folder_view_mixin.js b/app/assets/javascripts/environments/mixins/environments_folder_view_mixin.js new file mode 100644 index 00000000000..e793a7cadf2 --- /dev/null +++ b/app/assets/javascripts/environments/mixins/environments_folder_view_mixin.js @@ -0,0 +1,29 @@ +export default { + props: { + canaryDeploymentFeatureId: { + type: String, + required: false, + default: '', + }, + showCanaryDeploymentCallout: { + type: Boolean, + required: false, + default: false, + }, + userCalloutsPath: { + type: String, + required: false, + default: '', + }, + lockPromotionSvgPath: { + type: String, + required: false, + default: '', + }, + helpCanaryDeploymentsPath: { + type: String, + required: false, + default: '', + }, + }, +}; diff --git a/spec/javascripts/environments/folder/environments_folder_view_spec.js b/spec/javascripts/environments/folder/environments_folder_view_spec.js index 69ddd26eef1..ff15067aeac 100644 --- a/spec/javascripts/environments/folder/environments_folder_view_spec.js +++ b/spec/javascripts/environments/folder/environments_folder_view_spec.js @@ -3,6 +3,7 @@ import MockAdapter from 'axios-mock-adapter'; import axios from '~/lib/utils/axios_utils'; import environmentsFolderViewComponent from '~/environments/folder/environments_folder_view.vue'; import mountComponent from 'spec/helpers/vue_mount_component_helper'; +import { removeBreakLine, removeWhitespace } from 'spec/helpers/vue_component_helper'; import { environmentsList } from '../mock_data'; describe('Environments Folder View', () => { @@ -15,6 +16,11 @@ describe('Environments Folder View', () => { folderName: 'review', canReadEnvironment: true, cssContainerClass: 'container', + canaryDeploymentFeatureId: 'canary_deployment', + showCanaryDeploymentCallout: true, + userCalloutsPath: '/callouts', + lockPromotionSvgPath: '/assets/illustrations/lock-promotion.svg', + helpCanaryDeploymentsPath: 'help/canary-deployments', }; beforeEach(() => { @@ -89,9 +95,11 @@ describe('Environments Folder View', () => { it('should render parent folder name', done => { setTimeout(() => { - expect(component.$el.querySelector('.js-folder-name').textContent.trim()).toContain( - 'Environments / review', - ); + expect( + removeBreakLine( + removeWhitespace(component.$el.querySelector('.js-folder-name').textContent.trim()), + ), + ).toContain('Environments / review'); done(); }, 0); }); |