Fix specs for detailed statuses for manual actions

app/models/concerns/has_status.rb

@@ -4,8 +4,8 @@ module HasStatus
   DEFAULT_STATUS = 'created'.freeze
   BLOCKED_STATUS = 'manual'.freeze
   AVAILABLE_STATUSES = %w[created pending running success failed canceled skipped manual].freeze
-  STARTED_STATUSES = %w[running success failed skipped].freeze
-  ACTIVE_STATUSES = %w[pending running manual].freeze
+  STARTED_STATUSES = %w[running success failed skipped manual].freeze
+  ACTIVE_STATUSES = %w[pending running].freeze
   COMPLETED_STATUSES = %w[success failed canceled skipped].freeze
   ORDERED_STATUSES = %w[manual failed pending running canceled success skipped].freeze

spec/factories/ci/builds.rb

@@ -76,7 +76,6 @@ FactoryGirl.define do
     end
     trait :playable do
-      skipped
       manual
     end

spec/lib/gitlab/ci/status/build/factory_spec.rb

@@ -192,7 +192,7 @@ describe Gitlab::Ci::Status::Build::Factory do
       let(:build) { create(:ci_build, :playable) }
       it 'matches correct core status' do
-        expect(factory.core_status).to be_a Gitlab::Ci::Status::Skipped
+        expect(factory.core_status).to be_a Gitlab::Ci::Status::Manual
       end
       it 'matches correct extended statuses' do
@@ -218,7 +218,7 @@ describe Gitlab::Ci::Status::Build::Factory do
       let(:build) { create(:ci_build, :playable, :teardown_environment) }
       it 'matches correct core status' do
-        expect(factory.core_status).to be_a Gitlab::Ci::Status::Skipped
+        expect(factory.core_status).to be_a Gitlab::Ci::Status::Manual
       end
       it 'matches correct extended statuses' do