fix(api:repositories): commit listing

Author: caspiano

spec/helper.cr

@@ -225,3 +225,33 @@ macro test_crd(klass, controller_klass)
     {{ klass.id }}.find(id).should be_nil
   end
 end
+
+class MockServer
+  include ActionController::Router
+
+  def initialize
+    init_routes
+  end
+
+  private def init_routes
+    {% for klass in ActionController::Base::CONCRETE_CONTROLLERS %}
+      {{klass}}.__init_routes__(self)
+    {% end %}
+  end
+end
+
+MOCK_SERVER = MockServer.new
+
+abstract class PlaceOS::Api::Application < ActionController::Base
+  def self.with_request(verb, path, expect_failure = false)
+    io = IO::Memory.new
+    context = context(verb.upcase, path)
+    MOCK_SERVER.route_handler.search_route(context)
+    context.response.output = io
+
+    yield new(context)
+    io.rewind
+    context.response.status.success?.should (expect_failure ? be_false : be_true)
+    context
+  end
+end

spec/repositories_spec.cr

@@ -69,53 +69,14 @@ module PlaceOS::Api
           end
         end
 
-        describe "GET /:id/commits" do
-          context "interface" do
-            pending "fetches the commits for a repository" do
-            end
-          end
-
-          context "driver" do
-            repo = Model::Generator.repository(type: :driver)
-            repo.uri = "https://github.com/placeOS/private-drivers"
+        describe "driver only actions" do
+          repo = Model::Generator.repository(type: :interface)
+          before_all do
             repo.save!
-
-            it "fetches the commits for a repository" do
-              id = repo.id.as(String)
-              path = "#{base}#{id}/commits"
-              result = curl(
-                method: "GET",
-                path: path,
-                headers: authorization_header.merge({"Content-Type" => "application/json"}),
-              )
-
-              result.status.should eq HTTP::Status::OK
-              Array(String).from_json(result.body).should_not be_empty
-            end
-
-            it "fetches the commits for a file" do
-              id = repo.id.as(String)
-              params = HTTP::Params{
-                "driver" => "drivers/place/private_helper.cr",
-              }
-              path = "#{base}#{id}/commits?#{params}"
-              result = curl(
-                method: "GET",
-                path: path,
-                headers: authorization_header.merge({"Content-Type" => "application/json"}),
-              )
-
-              result.status.should eq HTTP::Status::OK
-              Array(String).from_json(result.body).should_not be_empty
-            end
           end
-        end
 
-        describe "driver only actions" do
           it "errors if enumerating drivers in an interface repo" do
-            repository = Model::Generator.repository(type: :interface).save!
-
-            id = repository.id.as(String)
+            id = repo.id.as(String)
             path = "#{base}#{id}/drivers"
             result = curl(
               method: "GET",
@@ -127,9 +88,7 @@ module PlaceOS::Api
           end
 
           it "errors when requesting driver details from an interface repo" do
-            repository = Model::Generator.repository(type: Model::Repository::Type::Interface).save!
-
-            id = repository.id.as(String)
+            id = repo.id.as(String)
             path = "#{base}#{id}/details"
             result = curl(
               method: "GET",
@@ -141,6 +100,45 @@ module PlaceOS::Api
           end
         end
       end
+
+      describe "GET /:id/commits" do
+        context "interface" do
+          pending "fetches the commits for a repository" do
+          end
+        end
+
+        context "driver" do
+          repo = Model::Generator.repository(type: :driver).tap do |r|
+            r.uri = "https://github.com/placeOS/private-drivers"
+          end
+
+          before_all do
+            repo.save!
+          end
+
+          it "fetches the commits for a repository" do
+            id = repo.id.as(String)
+            response = Api::Repositories
+              .with_request("GET", "#{base}#{id}/commits", &.commits)
+              .response
+            response.status.should eq HTTP::Status::OK
+            Array(String).from_json(response.output).should_not be_empty
+          end
+
+          it "fetches the commits for a file" do
+            id = repo.id.as(String)
+            params = HTTP::Params{
+              "driver" => "drivers/place/private_helper.cr",
+            }
+            response = Api::Repositories
+              .with_request("GET", "#{base}#{id}/commits?#{params}", &.commits)
+              .response
+
+            response.status.should eq HTTP::Status::OK
+            Array(String).from_json(response.output).should_not be_empty
+          end
+        end
+      end
     end
   end
 end

src/placeos-rest-api/controllers/repositories.cr

@@ -123,7 +123,7 @@ module PlaceOS::Api
       render json: commits
     end
 
-    def self.commits(repository : Model::Repository, request_id : String, file_name : String? = nil, branch : String? = nil, limit : Int32? = nil)
+    def self.commits(repository : Model::Repository, request_id : String, file_name : String? = nil, branch : String? = nil, limit : Int32? = nil) : Array(String)
       limit = 50 if limit.nil?
       branch = "master" if branch.nil?
 
@@ -136,12 +136,12 @@ module PlaceOS::Api
           else
             client.repository_commits(**args)
           end
-        end
+        end.map(&.commit)
       in .interface?
         # Dial the frontends service
         Frontends::Client.client(request_id: request_id) do |frontends_client|
           frontends_client.commits(repository.folder_name, limit)
-        end
+        end.map(&.[:commit])
       end
     end