Use detailed_status effectively. Remove unnecesarry context(nest). Add new context in merge_requests_controller_spec.rb and fix a bug. Correct description of spec.

2 files changed, 4 insertions, 8 deletions

diff --git a/spec/serializers/build_serializer_spec.rb b/spec/serializers/build_serializer_spec.rb
index 5a55d9d7dc1..3cc791bca50 100644
--- a/spec/serializers/build_serializer_spec.rb
+++ b/spec/serializers/build_serializer_spec.rb
@@ -29,10 +29,8 @@ describe BuildSerializer do
 
   describe '#represent_status' do
     context 'when represents only status' do
-      let(:status) do
-        Gitlab::Ci::Status::Success.new(double('object'), double('user'))
-      end
-      let(:resource) { create(:ci_build, status: :success) }
+      let(:resource) { create(:ci_build) }
+      let(:status) { resource.detailed_status(double('user')) }
 
       subject { serializer.represent_status(resource) }
 
diff --git a/spec/serializers/pipeline_serializer_spec.rb b/spec/serializers/pipeline_serializer_spec.rb
index 261f2152c22..8642b803844 100644
--- a/spec/serializers/pipeline_serializer_spec.rb
+++ b/spec/serializers/pipeline_serializer_spec.rb
@@ -97,10 +97,8 @@ describe PipelineSerializer do
 
   describe '#represent_status' do
     context 'when represents only status' do
-      let(:status) do
-        Gitlab::Ci::Status::Success.new(double('object'), double('user'))
-      end
-      let(:resource) { create(:ci_pipeline, status: :success) }
+      let(:resource) { create(:ci_pipeline) }
+      let(:status) { resource.detailed_status(double('user')) }
 
       subject { serializer.represent_status(resource) }