Update changes

app/controllers/projects/environments_controller.rb

@@ -54,7 +54,8 @@ class Projects::EnvironmentsController < Projects::ApplicationController
   def stop
     return render_404 unless @environment.available?
 
-    stop_action = @environment.run_stop!(current_user)
+    stop_action = @environment.stop_with_action!(current_user)
+
     if stop_action
       redirect_to polymorphic_path([project.namespace.becomes(Namespace), project, stop_action])
     else

app/controllers/projects/merge_requests_controller.rb

@@ -451,7 +451,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
           deployment = environment.first_deployment_for(@merge_request.diff_head_commit)
 
           stop_url =
-            if environment.can_run_stop_action? && can?(current_user, :create_deployment, environment)
+            if environment.stoppable? && can?(current_user, :create_deployment, environment)
               stop_namespace_project_environment_path(project.namespace, project, environment)
             end
 

app/models/environment.rb

@@ -110,15 +110,15 @@ class Environment < ActiveRecord::Base
     external_url.gsub(/\A.*?:\/\//, '')
   end
 
-  def can_run_stop_action?
+  def stop_action?
     available? && stop_action.present?
   end
 
-  def run_stop!(current_user)
+  def stop_with_action!(current_user)
     return unless available?
 
-    stop
-    stop_action.play(current_user)
+    stop!
+    stop_action.play(current_user) if stop_action
   end
 
   def actions_for(environment)

app/serializers/environment_entity.rb

@@ -7,7 +7,7 @@ class EnvironmentEntity < Grape::Entity
   expose :external_url
   expose :environment_type
   expose :last_deployment, using: DeploymentEntity
-  expose :can_run_stop_action?
+  expose :stoppable?
 
   expose :environment_path do |environment|
     namespace_project_environment_path(

app/services/ci/stop_environments_service.rb

@@ -8,10 +8,9 @@ module Ci
       return unless has_ref?
 
       environments.each do |environment|
-        next unless environment.stoppable?
         next unless can?(current_user, :create_deployment, project)
 
-        environment.stop!(current_user)
+        environment.stop_with_action!(current_user)
       end
     end
 

app/views/projects/environments/_stop.html.haml

-- if can?(current_user, :create_deployment, environment) && environment.can_run_stop_action?
+- if can?(current_user, :create_deployment, environment) && environment.stoppable?
   .inline
     = link_to stop_namespace_project_environment_path(@project.namespace, @project, environment), method: :post,
       class: 'btn stop-env-link', rel: 'nofollow', data: { confirm: 'Are you sure you want to stop this environment?' } do

app/views/projects/environments/show.html.haml

@@ -12,7 +12,7 @@
         = render 'projects/environments/external_url', environment: @environment
         - if can?(current_user, :update_environment, @environment)
           = link_to 'Edit', edit_namespace_project_environment_path(@project.namespace, @project, @environment), class: 'btn'
-        - if can?(current_user, :create_deployment, @environment) && @environment.available?
+        - if can?(current_user, :create_deployment, @environment) && @environment.can_stop?
           = link_to 'Stop', stop_namespace_project_environment_path(@project.namespace, @project, @environment), data: { confirm: 'Are you sure you want to stop this environment?' }, class: 'btn btn-danger', method: :post
 
   .deployments-container

spec/features/environment_spec.rb

@@ -64,10 +64,6 @@ feature 'Environment', :feature do
           expect(page).to have_link('Re-deploy')
         end
 
-        scenario 'does not show stop button' do
-          expect(page).not_to have_link('Stop')
-        end
-
         scenario 'does not show terminal button' do
           expect(page).not_to have_terminal_button
         end
@@ -116,27 +112,43 @@ feature 'Environment', :feature do
             end
           end
 
-          context 'with stop action' do
-            given(:manual) { create(:ci_build, :manual, pipeline: pipeline, name: 'close_app') }
-            given(:deployment) { create(:deployment, environment: environment, deployable: build, on_stop: 'close_app') }
+          context 'when environment is available' do
+            context 'with stop action' do
+              given(:manual) { create(:ci_build, :manual, pipeline: pipeline, name: 'close_app') }
+              given(:deployment) { create(:deployment, environment: environment, deployable: build, on_stop: 'close_app') }
 
-            scenario 'does show stop button' do
-              expect(page).to have_link('Stop')
-            end
+              scenario 'does show stop button' do
+                expect(page).to have_link('Stop')
+              end
 
-            scenario 'does allow to stop environment' do
-              click_link('Stop')
+              scenario 'does allow to stop environment' do
+                click_link('Stop')
 
-              expect(page).to have_content('close_app')
-            end
+                expect(page).to have_content('close_app')
+              end
 
-            context 'for reporter' do
-              let(:role) { :reporter }
+              context 'for reporter' do
+                let(:role) { :reporter }
 
-              scenario 'does not show stop button' do
-                expect(page).not_to have_link('Stop')
+                scenario 'does not show stop button' do
+                  expect(page).not_to have_link('Stop')
+                end
               end
             end
+
+            context 'without stop action' do
+              scenario 'does allow to stop environment' do
+                click_link('Stop')
+              end
+            end
+          end
+
+          context 'when environment is stopped' do
+            given(:environment) { create(:environment, project: project, state: :stopped) }
+
+            scenario 'does not show stop button' do
+              expect(page).not_to have_link('Stop')
+            end
           end
         end
       end

spec/models/environment_spec.rb

@@ -112,8 +112,8 @@ describe Environment, models: true do
     end
   end
 
-  describe '#can_run_stop_action?' do
-    subject { environment.can_run_stop_action? }
+  describe '#stoppable?' do
+    subject { environment.stoppable? }
 
     context 'when no other actions' do
       it { is_expected.to be_falsey }
@@ -142,10 +142,10 @@ describe Environment, models: true do
     end
   end
 
-  describe '#run_stop!' do
+  describe '#stop_with_action!' do
     let(:user) { create(:user) }
 
-    subject { environment.run_stop!(user) }
+    subject { environment.stop_with_action!(user) }
 
     before do
       expect(environment).to receive(:available?).and_call_original

spec/services/ci/stop_environments_service_spec.rb

@@ -42,10 +42,10 @@ describe Ci::StopEnvironmentsService, services: true do
           end
         end
 
-        context 'when environment is not stoppable' do
+        context 'when environment is not stopped' do
           before do
             allow_any_instance_of(Environment)
-              .to receive(:stoppable?).and_return(false)
+              .to receive(:state).and_return(:stopped)
           end
 
           it 'does not stop environment' do