Merge branch '25140-disable-stop-button' into 'master'

Disable stop environment button while deployment is running

See merge request gitlab-org/gitlab-ce!22805

2 files changed, 6 insertions, 2 deletions

diff --git a/spec/features/merge_request/user_sees_deployment_widget_spec.rb b/spec/features/merge_request/user_sees_deployment_widget_spec.rb
index cbd130b9740..0e439c8cb2d 100644
--- a/spec/features/merge_request/user_sees_deployment_widget_spec.rb
+++ b/spec/features/merge_request/user_sees_deployment_widget_spec.rb
@@ -38,7 +38,7 @@ describe 'Merge request > User sees deployment widget', :js do
       end
 
       it 'does start build when stop button clicked' do
-        accept_confirm { click_button('Stop environment') }
+        accept_confirm { find('.js-stop-env').click }
 
         expect(page).to have_content('close_app')
       end
@@ -47,7 +47,7 @@ describe 'Merge request > User sees deployment widget', :js do
         let(:role) { :reporter }
 
         it 'does not show stop button' do
-          expect(page).not_to have_button('Stop environment')
+          expect(page).not_to have_selector('.js-stop-env')
         end
       end
     end
diff --git a/spec/javascripts/vue_mr_widget/components/deployment_spec.js b/spec/javascripts/vue_mr_widget/components/deployment_spec.js
index 3d44af11153..2f1bd00fa10 100644
--- a/spec/javascripts/vue_mr_widget/components/deployment_spec.js
+++ b/spec/javascripts/vue_mr_widget/components/deployment_spec.js
@@ -242,6 +242,10 @@ describe('Deployment component', () => {
       it('renders information about running deployment', () => {
         expect(vm.$el.querySelector('.js-deployment-info').textContent).toContain('Deploying to');
       });
+
+      it('renders disabled stop button', () => {
+        expect(vm.$el.querySelector('.js-stop-env').getAttribute('disabled')).toBe('disabled');
+      });
     });
 
     describe('success', () => {