Fold core/extended status modules to reduce nesting

11 files changed, 11 insertions, 11 deletions

diff --git a/spec/lib/gitlab/ci/status/core/canceled_spec.rb b/spec/lib/gitlab/ci/status/canceled_spec.rb
index fd90eb6beda..619ecbcba67 100644
--- a/spec/lib/gitlab/ci/status/core/canceled_spec.rb
+++ b/spec/lib/gitlab/ci/status/canceled_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Gitlab::Ci::Status::Core::Canceled do
+describe Gitlab::Ci::Status::Canceled do
   subject { described_class.new(double('subject')) }
 
   describe '#text' do
diff --git a/spec/lib/gitlab/ci/status/core/created_spec.rb b/spec/lib/gitlab/ci/status/created_spec.rb
index a35a3e14929..157302c65a8 100644
--- a/spec/lib/gitlab/ci/status/core/created_spec.rb
+++ b/spec/lib/gitlab/ci/status/created_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Gitlab::Ci::Status::Core::Created do
+describe Gitlab::Ci::Status::Created do
   subject { described_class.new(double('subject')) }
 
   describe '#text' do
diff --git a/spec/lib/gitlab/ci/status/extended/base_spec.rb b/spec/lib/gitlab/ci/status/extended_spec.rb
index 7cdc68c927f..120e121aae5 100644
--- a/spec/lib/gitlab/ci/status/extended/base_spec.rb
+++ b/spec/lib/gitlab/ci/status/extended_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Gitlab::Ci::Status::Extended::Base do
+describe Gitlab::Ci::Status::Extended do
   subject do
     Class.new.extend(described_class)
   end
diff --git a/spec/lib/gitlab/ci/status/factory_spec.rb b/spec/lib/gitlab/ci/status/factory_spec.rb
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/spec/lib/gitlab/ci/status/factory_spec.rb
+++ /dev/null
diff --git a/spec/lib/gitlab/ci/status/core/failed_spec.rb b/spec/lib/gitlab/ci/status/failed_spec.rb
index 41ce63b3a6f..0b3cb8168e6 100644
--- a/spec/lib/gitlab/ci/status/core/failed_spec.rb
+++ b/spec/lib/gitlab/ci/status/failed_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Gitlab::Ci::Status::Core::Failed do
+describe Gitlab::Ci::Status::Failed do
   subject { described_class.new(double('subject')) }
 
   describe '#text' do
diff --git a/spec/lib/gitlab/ci/status/core/pending_spec.rb b/spec/lib/gitlab/ci/status/pending_spec.rb
index 988d3c0a9e2..57c901c1202 100644
--- a/spec/lib/gitlab/ci/status/core/pending_spec.rb
+++ b/spec/lib/gitlab/ci/status/pending_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Gitlab::Ci::Status::Core::Pending do
+describe Gitlab::Ci::Status::Pending do
   subject { described_class.new(double('subject')) }
 
   describe '#text' do
diff --git a/spec/lib/gitlab/ci/status/extended/pipeline/common_spec.rb b/spec/lib/gitlab/ci/status/pipeline/common_spec.rb
index 32939800c70..21adee3f8e7 100644
--- a/spec/lib/gitlab/ci/status/extended/pipeline/common_spec.rb
+++ b/spec/lib/gitlab/ci/status/pipeline/common_spec.rb
@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-describe Gitlab::Ci::Status::Extended::Pipeline::Common do
+describe Gitlab::Ci::Status::Pipeline::Common do
   let(:pipeline) { create(:ci_pipeline) }
 
   subject do
-    Gitlab::Ci::Status::Core::Success
+    Class.new(Gitlab::Ci::Status::Core)
       .new(pipeline).extend(described_class)
   end
 
diff --git a/spec/lib/gitlab/ci/status/extended/pipeline/success_with_warnings_spec.rb b/spec/lib/gitlab/ci/status/pipeline/success_with_warnings_spec.rb
index b1a63c5f2f9..02e526e3de2 100644
--- a/spec/lib/gitlab/ci/status/extended/pipeline/success_with_warnings_spec.rb
+++ b/spec/lib/gitlab/ci/status/pipeline/success_with_warnings_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Gitlab::Ci::Status::Extended::Pipeline::SuccessWithWarnings do
+describe Gitlab::Ci::Status::Pipeline::SuccessWithWarnings do
   subject do
     described_class.new(double('status'))
   end
diff --git a/spec/lib/gitlab/ci/status/core/running_spec.rb b/spec/lib/gitlab/ci/status/running_spec.rb
index dbb0d37659c..c023f1872cc 100644
--- a/spec/lib/gitlab/ci/status/core/running_spec.rb
+++ b/spec/lib/gitlab/ci/status/running_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Gitlab::Ci::Status::Core::Running do
+describe Gitlab::Ci::Status::Running do
   subject { described_class.new(double('subject')) }
 
   describe '#text' do
diff --git a/spec/lib/gitlab/ci/status/core/skipped_spec.rb b/spec/lib/gitlab/ci/status/skipped_spec.rb
index 624348af2d1..d4f7f4b3b70 100644
--- a/spec/lib/gitlab/ci/status/core/skipped_spec.rb
+++ b/spec/lib/gitlab/ci/status/skipped_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Gitlab::Ci::Status::Core::Skipped do
+describe Gitlab::Ci::Status::Skipped do
   subject { described_class.new(double('subject')) }
 
   describe '#text' do
diff --git a/spec/lib/gitlab/ci/status/core/success_spec.rb b/spec/lib/gitlab/ci/status/success_spec.rb
index c4bc0d5e234..9e261a3aa5f 100644
--- a/spec/lib/gitlab/ci/status/core/success_spec.rb
+++ b/spec/lib/gitlab/ci/status/success_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Gitlab::Ci::Status::Core::Success do
+describe Gitlab::Ci::Status::Success do
   subject { described_class.new(double('subject')) }
 
   describe '#text' do