1 files changed, 21 insertions, 18 deletions

diff --git a/spec/requests/api/commits_spec.rb b/spec/requests/api/commits_spec.rb
index 585449e62b6..0dad547735d 100644
--- a/spec/requests/api/commits_spec.rb
+++ b/spec/requests/api/commits_spec.rb
@@ -1,21 +1,23 @@
 require 'spec_helper'
 require 'mime/types'
 
-describe API::Commits, api: true  do
-  include ApiHelpers
+describe API::Commits do
   let(:user) { create(:user) }
   let(:user2) { create(:user) }
   let!(:project) { create(:project, :repository, creator: user, namespace: user.namespace) }
-  let!(:master) { create(:project_member, :master, user: user, project: project) }
   let!(:guest) { create(:project_member, :guest, user: user2, project: project) }
   let!(:note) { create(:note_on_commit, author: user, project: project, commit_id: project.repository.commit.id, note: 'a comment on a commit') }
   let!(:another_note) { create(:note_on_commit, author: user, project: project, commit_id: project.repository.commit.id, note: 'another comment on a commit') }
 
-  before { project.team << [user, :reporter] }
+  before do
+    project.team << [user, :reporter]
+  end
 
   describe "List repository commits" do
     context "authorized user" do
-      before { project.team << [user2, :reporter] }
+      before do
+        project.team << [user2, :reporter]
+      end
 
       it "returns project commits" do
         commit = project.repository.commit
@@ -178,7 +180,7 @@ describe API::Commits, api: true  do
     end
   end
 
-  describe "Create a commit with multiple files and actions" do
+  describe "POST /projects/:id/repository/commits" do
     let!(:url) { "/projects/#{project.id}/repository/commits" }
 
     it 'returns a 403 unauthorized for user without permissions' do
@@ -193,7 +195,7 @@ describe API::Commits, api: true  do
       expect(response).to have_http_status(400)
     end
 
-    context :create do
+    describe 'create' do
       let(:message) { 'Created file' }
       let!(:invalid_c_params) do
         {
@@ -237,8 +239,8 @@ describe API::Commits, api: true  do
         expect(response).to have_http_status(400)
       end
 
-      context 'with project path in URL' do
-        let(:url) { "/projects/#{project.full_path.gsub('/', '%2F')}/repository/commits" }
+      context 'with project path containing a dot in URL' do
+        let(:url) { "/projects/#{CGI.escape(project.full_path)}/repository/commits" }
 
         it 'a new file in project repo' do
           post api(url, user), valid_c_params
@@ -248,7 +250,7 @@ describe API::Commits, api: true  do
       end
     end
 
-    context :delete do
+    describe 'delete' do
       let(:message) { 'Deleted file' }
       let!(:invalid_d_params) do
         {
@@ -289,7 +291,7 @@ describe API::Commits, api: true  do
       end
     end
 
-    context :move do
+    describe 'move' do
       let(:message) { 'Moved file' }
       let!(:invalid_m_params) do
         {
@@ -334,7 +336,7 @@ describe API::Commits, api: true  do
       end
     end
 
-    context :update do
+    describe 'update' do
       let(:message) { 'Updated file' }
       let!(:invalid_u_params) do
         {
@@ -377,7 +379,7 @@ describe API::Commits, api: true  do
       end
     end
 
-    context "multiple operations" do
+    describe 'multiple operations' do
       let(:message) { 'Multiple actions' }
       let!(:invalid_mo_params) do
         {
@@ -487,7 +489,7 @@ describe API::Commits, api: true  do
       end
 
       it "returns status for CI" do
-        pipeline = project.ensure_pipeline('master', project.repository.commit.sha)
+        pipeline = project.pipelines.create(source: :push, ref: 'master', sha: project.repository.commit.sha)
         pipeline.update(status: 'success')
 
         get api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}", user)
@@ -497,7 +499,7 @@ describe API::Commits, api: true  do
       end
 
       it "returns status for CI when pipeline is created" do
-        project.ensure_pipeline('master', project.repository.commit.sha)
+        project.pipelines.create(source: :push, ref: 'master', sha: project.repository.commit.sha)
 
         get api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}", user)
 
@@ -516,7 +518,9 @@ describe API::Commits, api: true  do
 
   describe "Get the diff of a commit" do
     context "authorized user" do
-      before { project.team << [user2, :reporter] }
+      before do
+        project.team << [user2, :reporter]
+      end
 
       it "returns the diff of the selected commit" do
         get api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}/diff", user)
@@ -599,8 +603,7 @@ describe API::Commits, api: true  do
         post api("/projects/#{project.id}/repository/commits/#{master_pickable_commit.id}/cherry_pick", user), branch: 'markdown'
 
         expect(response).to have_http_status(400)
-        expect(json_response['message']).to eq('Sorry, we cannot cherry-pick this commit automatically.
-                     A cherry-pick may have already been performed with this commit, or a more recent commit may have updated some of its content.')
+        expect(json_response['message']).to include('Sorry, we cannot cherry-pick this commit automatically.')
       end
 
       it 'returns 400 if you are not allowed to push to the target branch' do