From 8f32724fcb7f05052b53dcd365a064ad87a9535e Mon Sep 17 00:00:00 2001
From: Shinya Maeda <gitlab.shinyamaeda@gmail.com>
Date: Fri, 17 Mar 2017 23:50:20 +0900
Subject: Ci::Pipeline to project.pipelines

---
 spec/finders/pipelines_finder_spec.rb | 46 +++++++++++++++++------------------
 spec/requests/api/pipelines_spec.rb   | 18 +++++++-------
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/spec/finders/pipelines_finder_spec.rb b/spec/finders/pipelines_finder_spec.rb
index ac64df8aeb8..13218cd8b50 100644
--- a/spec/finders/pipelines_finder_spec.rb
+++ b/spec/finders/pipelines_finder_spec.rb
@@ -24,11 +24,11 @@ describe PipelinesFinder do
       let(:params) { {} }
 
       it 'returns all pipelines' do
-        expect(subject).to match_array(Ci::Pipeline.all)
+        expect(subject).to match_array(project.pipelines)
       end
 
       it 'orders in descending order on ID' do
-        expect(subject).to eq(Ci::Pipeline.order(id: :desc))
+        expect(subject).to eq(project.pipelines.order(id: :desc))
       end
     end
 
@@ -37,7 +37,7 @@ describe PipelinesFinder do
         let(:params) { { scope: 'running' } }
 
         it 'returns matched pipelines' do
-          expect(subject).to match_array(Ci::Pipeline.running)
+          expect(subject).to match_array(project.pipelines.running)
         end
       end
 
@@ -45,7 +45,7 @@ describe PipelinesFinder do
         let(:params) { { scope: 'pending' } }
 
         it 'returns matched pipelines' do
-          expect(subject).to match_array(Ci::Pipeline.pending)
+          expect(subject).to match_array(project.pipelines.pending)
         end
       end
 
@@ -53,7 +53,7 @@ describe PipelinesFinder do
         let(:params) { { scope: 'finished' } }
 
         it 'returns matched pipelines' do
-          expect(subject).to match_array(Ci::Pipeline.finished)
+          expect(subject).to match_array(project.pipelines.finished)
         end
       end
 
@@ -61,7 +61,7 @@ describe PipelinesFinder do
         let(:params) { { scope: 'branches' } }
 
         it 'returns matched pipelines' do
-          expect(subject).to eq([Ci::Pipeline.where(tag: false).last])
+          expect(subject).to eq([project.pipelines.where(tag: false).last])
         end
       end
 
@@ -69,7 +69,7 @@ describe PipelinesFinder do
         let(:params) { { scope: 'tags' } }
 
         it 'returns matched pipelines' do
-          expect(subject).to eq([Ci::Pipeline.where(tag: true).last])
+          expect(subject).to eq([project.pipelines.where(tag: true).last])
         end
       end
     end
@@ -79,7 +79,7 @@ describe PipelinesFinder do
         let(:params) { { status: 'running' } }
 
         it 'returns matched pipelines' do
-          expect(subject).to match_array(Ci::Pipeline.running)
+          expect(subject).to match_array(project.pipelines.running)
         end
       end
 
@@ -87,7 +87,7 @@ describe PipelinesFinder do
         let(:params) { { status: 'pending' } }
 
         it 'returns matched pipelines' do
-          expect(subject).to match_array(Ci::Pipeline.pending)
+          expect(subject).to match_array(project.pipelines.pending)
         end
       end
 
@@ -95,7 +95,7 @@ describe PipelinesFinder do
         let(:params) { { status: 'success' } }
 
         it 'returns matched pipelines' do
-          expect(subject).to match_array(Ci::Pipeline.success)
+          expect(subject).to match_array(project.pipelines.success)
         end
       end
 
@@ -103,7 +103,7 @@ describe PipelinesFinder do
         let(:params) { { status: 'failed' } }
 
         it 'returns matched pipelines' do
-          expect(subject).to match_array(Ci::Pipeline.failed)
+          expect(subject).to match_array(project.pipelines.failed)
         end
       end
 
@@ -111,7 +111,7 @@ describe PipelinesFinder do
         let(:params) { { status: 'canceled' } }
 
         it 'returns matched pipelines' do
-          expect(subject).to match_array(Ci::Pipeline.canceled)
+          expect(subject).to match_array(project.pipelines.canceled)
         end
       end
 
@@ -119,7 +119,7 @@ describe PipelinesFinder do
         let(:params) { { status: 'skipped' } }
 
         it 'returns matched pipelines' do
-          expect(subject).to match_array(Ci::Pipeline.skipped)
+          expect(subject).to match_array(project.pipelines.skipped)
         end
       end
     end 
@@ -129,7 +129,7 @@ describe PipelinesFinder do
         let(:params) { { ref: 'master' } }
 
         it 'returns matched pipelines' do
-          expect(subject).to match_array(Ci::Pipeline.where(ref: 'master'))
+          expect(subject).to match_array(project.pipelines.where(ref: 'master'))
         end
       end
 
@@ -147,7 +147,7 @@ describe PipelinesFinder do
         let(:params) { { name: user1.name } }
 
         it 'returns matched pipelines' do
-          expect(subject).to match_array(Ci::Pipeline.where(user: user1))
+          expect(subject).to match_array(project.pipelines.where(user: user1))
         end
       end
 
@@ -165,7 +165,7 @@ describe PipelinesFinder do
         let(:params) { { username: user1.username } }
 
         it 'returns matched pipelines' do
-          expect(subject).to match_array(Ci::Pipeline.where(user: user1))
+          expect(subject).to match_array(project.pipelines.where(user: user1))
         end
       end
 
@@ -183,7 +183,7 @@ describe PipelinesFinder do
         let(:params) { { yaml_errors: true } }
 
         it 'returns matched pipelines' do
-          expect(subject).to match_array(Ci::Pipeline.where("yaml_errors IS NOT NULL"))
+          expect(subject).to match_array(project.pipelines.where("yaml_errors IS NOT NULL"))
         end
       end
 
@@ -191,7 +191,7 @@ describe PipelinesFinder do
         let(:params) { { yaml_errors: false } }
 
         it 'returns matched pipelines' do
-          expect(subject).to match_array(Ci::Pipeline.where("yaml_errors IS NULL"))
+          expect(subject).to match_array(project.pipelines.where("yaml_errors IS NULL"))
         end
       end
 
@@ -199,7 +199,7 @@ describe PipelinesFinder do
         let(:params) { { yaml_errors: "UnexpectedValue" } }
 
         it 'returns all pipelines' do
-          expect(subject).to match_array(Ci::Pipeline.all)
+          expect(subject).to match_array(project.pipelines.all)
         end
       end
     end
@@ -209,7 +209,7 @@ describe PipelinesFinder do
         let(:params) { { order_by: 'user_id', sort: 'asc' } }
 
         it 'sorts pipelines' do
-          expect(subject).to eq(Ci::Pipeline.order(user_id: :asc))
+          expect(subject).to eq(project.pipelines.order(user_id: :asc))
         end
       end
 
@@ -217,7 +217,7 @@ describe PipelinesFinder do
         let(:params) { { order_by: 'invalid_column', sort: 'asc' } }
 
         it 'sorts pipelines with id: (default)' do
-          expect(subject).to eq(Ci::Pipeline.order(id: :asc))
+          expect(subject).to eq(project.pipelines.order(id: :asc))
         end
       end
 
@@ -225,7 +225,7 @@ describe PipelinesFinder do
         let(:params) { { order_by: 'user_id', sort: 'invalid_sort' } }
 
         it 'sorts pipelines with :desc (default)' do
-          expect(subject).to eq(Ci::Pipeline.order(user_id: :desc))
+          expect(subject).to eq(project.pipelines.order(user_id: :desc))
         end
       end
 
@@ -233,7 +233,7 @@ describe PipelinesFinder do
         let(:params) { { order_by: nil, sort: nil } }
 
         it 'sorts pipelines by default' do
-          expect(subject).to eq(Ci::Pipeline.order(id: :desc))
+          expect(subject).to eq(project.pipelines.order(id: :desc))
         end
       end
     end
diff --git a/spec/requests/api/pipelines_spec.rb b/spec/requests/api/pipelines_spec.rb
index e3cda85b244..5e20a823d39 100644
--- a/spec/requests/api/pipelines_spec.rb
+++ b/spec/requests/api/pipelines_spec.rb
@@ -74,7 +74,7 @@ describe API::Pipelines do
               expect(response).to have_http_status(200)
               expect(response).to include_pagination_headers
               expect(json_response).not_to be_empty
-              expect(json_response.last['sha']).to eq(Ci::Pipeline.where(tag: false).last.sha)
+              expect(json_response.last['sha']).to eq(project.pipelines.where(tag: false).last.sha)
             end
           end
 
@@ -85,7 +85,7 @@ describe API::Pipelines do
               expect(response).to have_http_status(200)
               expect(response).to include_pagination_headers
               expect(json_response).not_to be_empty
-              expect(json_response.last['sha']).to eq(Ci::Pipeline.where(tag: true).last.sha)
+              expect(json_response.last['sha']).to eq(project.pipelines.where(tag: true).last.sha)
             end
           end
 
@@ -151,7 +151,7 @@ describe API::Pipelines do
 
               expect(response).to have_http_status(200)
               expect(response).to include_pagination_headers
-              expect(json_response.first['sha']).to eq(Ci::Pipeline.where(user: user1).order(id: :desc).first.sha)
+              expect(json_response.first['sha']).to eq(project.pipelines.where(user: user1).order(id: :desc).first.sha)
             end
           end
 
@@ -173,7 +173,7 @@ describe API::Pipelines do
 
               expect(response).to have_http_status(200)
               expect(response).to include_pagination_headers
-              expect(json_response.first['sha']).to eq(Ci::Pipeline.where(user: user1).order(id: :desc).first.sha)
+              expect(json_response.first['sha']).to eq(project.pipelines.where(user: user1).order(id: :desc).first.sha)
             end
           end
 
@@ -195,7 +195,7 @@ describe API::Pipelines do
 
               expect(response).to have_http_status(200)
               expect(response).to include_pagination_headers
-              expect(json_response.first['id']).to eq(Ci::Pipeline.where("yaml_errors IS NOT NULL").order(id: :desc).first.id)
+              expect(json_response.first['id']).to eq(project.pipelines.where("yaml_errors IS NOT NULL").order(id: :desc).first.id)
             end
           end
 
@@ -205,7 +205,7 @@ describe API::Pipelines do
 
               expect(response).to have_http_status(200)
               expect(response).to include_pagination_headers
-              expect(json_response.first['id']).to eq(Ci::Pipeline.where("yaml_errors IS NULL").order(id: :desc).first.id)
+              expect(json_response.first['id']).to eq(project.pipelines.where("yaml_errors IS NULL").order(id: :desc).first.id)
             end
           end
 
@@ -221,12 +221,12 @@ describe API::Pipelines do
         context 'when order_by and sort are passed' do
           context 'when order_by and sort are valid' do
             it 'sorts pipelines' do
-              get api("/projects/#{project.id}/pipelines?order_by=id&sort=asc", user)
+              get api("/projects/#{project.id}/pipelines?order_by=user_id&sort=asc", user)
 
               expect(response).to have_http_status(200)
               expect(response).to include_pagination_headers
-              expect(json_response.first['id']).to eq(Ci::Pipeline.order(id: :asc).first.id)
-              expect(json_response.last['id']).to eq(Ci::Pipeline.order(id: :asc).last.id)
+              expect(json_response.first['id']).to eq(project.pipelines.order(user_id: :asc).first.id)
+              expect(json_response.last['id']).to eq(project.pipelines.order(user_id: :asc).last.id)
             end
           end
 
-- 
cgit v1.2.1