diff options
author | Andrew Fontaine <afontaine@gitlab.com> | 2019-03-05 18:33:10 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2019-03-05 18:33:10 +0000 |
commit | ba98e91c067444e5af8dee392921126390af78b6 (patch) | |
tree | 945a450b6d29f7226c1cfb38c94d7f995e39036a /spec | |
parent | 5fd1dc1562b191599014ec61cc6693efbb36db05 (diff) | |
download | gitlab-ce-ba98e91c067444e5af8dee392921126390af78b6.tar.gz |
Add Component to Confirm Environment Rollback
Ensure a vue.js component to confirm the re-deployment/rollback of an
environment pops up when rollback/re-deploy has been clicked so the user
must confirm their actions before accidentally rolling back or
re-deploying an environment.
Only on the `environment-table` view.
Diffstat (limited to 'spec')
3 files changed, 162 insertions, 3 deletions
diff --git a/spec/javascripts/environments/confirm_rollback_modal_spec.js b/spec/javascripts/environments/confirm_rollback_modal_spec.js new file mode 100644 index 00000000000..05715bce38f --- /dev/null +++ b/spec/javascripts/environments/confirm_rollback_modal_spec.js @@ -0,0 +1,70 @@ +import { shallowMount } from '@vue/test-utils'; +import { GlModal } from '@gitlab/ui'; +import ConfirmRollbackModal from '~/environments/components/confirm_rollback_modal.vue'; +import eventHub from '~/environments/event_hub'; + +describe('Confirm Rollback Modal Component', () => { + let environment; + + beforeEach(() => { + environment = { + name: 'test', + last_deployment: { + commit: { + short_id: 'abc0123', + }, + }, + modalId: 'test', + }; + }); + + it('should show "Rollback" when isLastDeployment is false', () => { + const component = shallowMount(ConfirmRollbackModal, { + propsData: { + environment: { + ...environment, + isLastDeployment: false, + }, + }, + }); + const modal = component.find(GlModal); + + expect(modal.attributes('title')).toContain('Rollback'); + expect(modal.attributes('title')).toContain('test'); + expect(modal.attributes('ok-title')).toBe('Rollback'); + expect(modal.text()).toContain('commit abc0123'); + expect(modal.text()).toContain('Are you sure you want to continue?'); + }); + + it('should show "Re-deploy" when isLastDeployment is true', () => { + const component = shallowMount(ConfirmRollbackModal, { + propsData: { + environment: { + ...environment, + isLastDeployment: true, + }, + }, + }); + const modal = component.find(GlModal); + + expect(modal.attributes('title')).toContain('Re-deploy'); + expect(modal.attributes('title')).toContain('test'); + expect(modal.attributes('ok-title')).toBe('Re-deploy'); + expect(modal.text()).toContain('commit abc0123'); + expect(modal.text()).toContain('Are you sure you want to continue?'); + }); + + it('should emit the "rollback" event when "ok" is clicked', () => { + environment = { ...environment, isLastDeployment: true }; + const component = shallowMount(ConfirmRollbackModal, { + propsData: { + environment, + }, + }); + const eventHubSpy = spyOn(eventHub, '$emit'); + const modal = component.find(GlModal); + modal.vm.$emit('ok'); + + expect(eventHubSpy).toHaveBeenCalledWith('rollbackEnvironment', environment); + }); +}); diff --git a/spec/javascripts/environments/environment_rollback_spec.js b/spec/javascripts/environments/environment_rollback_spec.js index 79f33c5bc8a..8c47f6a12c0 100644 --- a/spec/javascripts/environments/environment_rollback_spec.js +++ b/spec/javascripts/environments/environment_rollback_spec.js @@ -1,8 +1,11 @@ import Vue from 'vue'; +import { shallowMount } from '@vue/test-utils'; +import { GlButton } from '@gitlab/ui'; +import eventHub from '~/environments/event_hub'; import rollbackComp from '~/environments/components/environment_rollback.vue'; describe('Rollback Component', () => { - const retryURL = 'https://gitlab.com/retry'; + const retryUrl = 'https://gitlab.com/retry'; let RollbackComponent; beforeEach(() => { @@ -13,8 +16,9 @@ describe('Rollback Component', () => { const component = new RollbackComponent({ el: document.querySelector('.test-dom-element'), propsData: { - retryUrl: retryURL, + retryUrl, isLastDeployment: true, + environment: {}, }, }).$mount(); @@ -25,11 +29,33 @@ describe('Rollback Component', () => { const component = new RollbackComponent({ el: document.querySelector('.test-dom-element'), propsData: { - retryUrl: retryURL, + retryUrl, isLastDeployment: false, + environment: {}, }, }).$mount(); expect(component.$el).toHaveSpriteIcon('redo'); }); + + it('should emit a "rollback" event on button click', () => { + const eventHubSpy = spyOn(eventHub, '$emit'); + const component = shallowMount(RollbackComponent, { + propsData: { + retryUrl, + environment: { + name: 'test', + }, + }, + }); + const button = component.find(GlButton); + + button.vm.$emit('click'); + + expect(eventHubSpy).toHaveBeenCalledWith('requestRollbackEnvironment', { + retryUrl, + isLastDeployment: true, + name: 'test', + }); + }); }); diff --git a/spec/views/projects/deployments/_confirm_rollback_modal_spec.html.rb b/spec/views/projects/deployments/_confirm_rollback_modal_spec.html.rb new file mode 100644 index 00000000000..54ec4f32856 --- /dev/null +++ b/spec/views/projects/deployments/_confirm_rollback_modal_spec.html.rb @@ -0,0 +1,63 @@ +# frozen_string_literal: true + +require 'spec_helper' + +describe 'projects/deployments/_confirm_rollback_modal' do + let(:environment) { create(:environment, :with_review_app) } + let(:deployments) { environment.deployments } + let(:project) { environment.project } + + before do + assign(:environment, environment) + assign(:deployments, deployments) + assign(:project, project) + end + + context 'when re-deploying last deployment' do + let(:deployment) { deployments.first } + + before do + allow(view).to receive(:deployment).and_return(deployment) + end + + it 'shows "re-deploy"' do + render + + expect(rendered).to have_selector('h4', text: "Re-deploy environment #{environment.name}?") + expect(rendered).to have_selector('p', text: "This action will relaunch the job for commit #{deployment.short_sha}, putting the environment in a previous version. Are you sure you want to continue?") + expect(rendered).to have_selector('a.btn-danger', text: 'Re-deploy') + end + + it 'links to re-deploying the environment' do + expected_link = retry_project_job_path(environment.project, deployment.deployable) + + render + + expect(rendered).to have_selector("a[href='#{expected_link}']", text: 'Re-deploy') + end + end + + context 'when rolling back to previous deployment' do + let(:deployment) { create(:deployment, environment: environment) } + + before do + allow(view).to receive(:deployment).and_return(deployment) + end + + it 'shows "rollback"' do + render + + expect(rendered).to have_selector('h4', text: "Rollback environment #{environment.name}?") + expect(rendered).to have_selector('p', text: "This action will run the job defined by staging for commit #{deployment.short_sha}, putting the environment in a previous version. You can revert it by re-deploying the latest version of your application. Are you sure you want to continue?") + expect(rendered).to have_selector('a.btn-danger', text: 'Rollback') + end + + it 'links to re-deploying the environment' do + expected_link = retry_project_job_path(environment.project, deployment.deployable) + + render + + expect(rendered).to have_selector("a[href='#{expected_link}']", text: 'Rollback') + end + end +end |