repository_files_spec.rb in gitlab-4.2.0

- old
+ new

@@ -20,11 +20,11 @@
     before do
       stub_get("/projects/3/repository/files/README%2Emd?ref=master", "get_repository_file")
       @file = Gitlab.get_file(3, 'README.md', 'master')
     end
 
-    it "should create the correct resource" do
+    it "should get the correct resource" do
       expect(a_get("/projects/3/repository/files/README%2Emd?ref=master")).to have_been_made
     end
 
     it "should return the base64 encoded file" do
       expect(@file.file_path).to eq "README.md"
@@ -32,42 +32,60 @@
       expect(@file.content).to eq "VGhpcyBpcyBhICpSRUFETUUqIQ==\n"
     end
   end
 
   describe ".create_file" do
-    let!(:request_stub) { stub_post("/projects/3/repository/files", "repository_file") }
-    let!(:file) { Gitlab.create_file(3, "path", "branch", "content", "commit message") }
+    let(:api_path) { "/projects/3/repository/files/path" }
+    let!(:request_stub) { stub_post(api_path, "repository_file") }
+    let!(:file) { Gitlab.create_file(3, "path", "branch", "content", "commit message", author_name: "joe") }
 
     it "should create the correct resource" do
-      expect(request_stub).to have_been_made
+      expected_parameters = {
+        author_name: "joe",
+        branch: "branch",
+        commit_message: "commit message"
+      }
+      expect(a_post(api_path).with(body: hash_including(expected_parameters))).to have_been_made
     end
 
     it "should return information about the new file" do
       expect(file.file_path).to eq "path"
       expect(file.branch_name).to eq "branch"
     end
   end
 
   describe ".edit_file" do
-    let!(:request_stub) { stub_put("/projects/3/repository/files", "repository_file") }
-    let!(:file) { Gitlab.edit_file(3, "path", "branch", "content", "commit message") }
+    let(:api_path) { "/projects/3/repository/files/path" }
+    let!(:request_stub) { stub_put(api_path, "repository_file") }
+    let!(:file) { Gitlab.edit_file(3, "path", "branch", "content", "commit message", author_name: "joe") }
 
-    it "should create the correct resource" do
-      expect(request_stub).to have_been_made
+    it "should update the correct resource" do
+      expected_parameters = {
+        author_name: "joe",
+        branch: "branch",
+        commit_message: "commit message"
+      }
+      expect(a_put(api_path).with(body: hash_including(expected_parameters))).to have_been_made
     end
 
     it "should return information about the new file" do
       expect(file.file_path).to eq "path"
       expect(file.branch_name).to eq "branch"
     end
   end
 
   describe ".remove_file" do
-    let!(:request_stub) { stub_delete("/projects/3/repository/files", "repository_file") }
-    let!(:file) { Gitlab.remove_file(3, "path", "branch", "commit message") }
+    let(:api_path) { "/projects/3/repository/files/path" }
+    let!(:request_stub) { stub_delete(api_path, "repository_file") }
+    let!(:file) { Gitlab.remove_file(3, "path", "branch", "commit message", author_name: "joe") }
 
-    it "should create the correct resource" do
-      expect(request_stub).to have_been_made
+    it "should update the correct resource" do
+      expected_parameters = {
+        author_name: "joe",
+        branch: "branch",
+        commit_message: "commit message"
+      }
+      expect(a_delete(api_path).with(body: hash_including(expected_parameters))).to have_been_made
     end
 
     it "should return information about the new file" do
       expect(file.file_path).to eq "path"
       expect(file.branch_name).to eq "branch"