Merge pull request #22 from SwitchDreams/bug/fixes_minor_bugs

Bug/fixes minor bugs

Author: PedroAugustoRamalhoDuarte

lib/generators/rest_api_generator/helpers.rb

@@ -71,22 +71,24 @@ def scope_route_path
     def nested_routes
       return "" if options["father"].blank?
 
-      "#{options["father"].downcase.pluralize}/\#{#{options["father"].singularize.downcase}.id}/#{plural_name}"
+      "#{options["father"].downcase.pluralize}/\#{#{options["father"].singularize.downcase}.id}"
     end
 
     def initial_route
-      return "/#{plural_name}" if options["father"].blank? && options["scope"].blank?
-
-      scope_route_path + "/" + nested_routes
+      route = ""
+      route += scope_route_path if options["scope"].present?
+      route += options["father"].present? && route.present? ? "/#{nested_routes}" : nested_routes
+      route += "/#{plural_name}"
+      route[0] == "/" ? route : "/#{route}"
     end
 
     def spec_routes
       {
         index: initial_route,
-        show: initial_route + "\#{#{singular_name}.id}",
+        show: initial_route + "/\#{#{singular_name}.id}",
         create: initial_route,
-        update: initial_route + "\#{#{singular_name}.id}",
-        delete: initial_route + "\#{#{singular_name}.id}",
+        update: initial_route + "/\#{#{singular_name}.id}",
+        delete: initial_route + "/\#{#{singular_name}.id}",
       }
     end
   end

lib/generators/rest_api_generator/spec/rspec_generator.rb

@@ -26,9 +26,9 @@ def controller_test_path
 
       def spec_controller_template
         if options["father"].present?
-          "rspec/resource_controller_spec.rb"
-        else
           "rspec/nested_resource_controller_spec.rb"
+        else
+          "rspec/resource_controller_spec.rb"
         end
       end
     end

lib/generators/rest_api_generator/spec/rswag_generator.rb

@@ -25,7 +25,7 @@ def create_service_file
       def nested_routes
         return "" if options["father"].blank?
 
-        "#{options["father"].downcase.pluralize}/{#{options["father"].singularize.downcase}_id}/#{plural_name}"
+        "#{options["father"].downcase.pluralize}/{#{options["father"].singularize.downcase}_id}"
       end
 
       def spec_routes

lib/generators/rest_api_generator/spec/templates/rspec/resource_controller_spec.rb.tt

@@ -38,7 +38,7 @@ RSpec.describe "<%= class_name %>", type: :request do
 
   describe "DELETE /<%= plural_name %>/:id" do
     it "deletes an <%= plural_name %>" do
-      item = create(:<%= singular_name %>)
+      <%= singular_name %> = create(:<%= singular_name %>)
       expect do
         delete "<%= spec_routes[:delete] %>"
       end.to change(<%= class_name %>, :count).by(-1)

spec/lib/generators/rest_api_generator/spec/rspec_generator_spec.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+require "generators/rest_api_generator/spec/rspec_generator"
+require "support/generators"
+
+RSpec.describe RestApiGenerator::Spec::RspecGenerator, type: :generator do
+  setup_default_destination
+
+  context "when is nested resource" do
+    before do
+      run_generator ["Driver", "car:references", "name:string", "--father", "Cars"]
+    end
+
+    describe "spec file" do
+      subject(:spec_file) { file("spec/requests/cars/drivers_controller_spec.rb") }
+
+      it { is_expected.to exist }
+
+      it "describe right routes for show" do
+        expect(spec_file).to contain('/cars/#{car.id}/drivers/#{driver.id}')
+      end
+    end
+  end
+
+  context "when is scoped resource" do
+    before do
+      run_generator ["Driver", "car:references", "name:string", "--scope", "Cars"]
+    end
+
+    describe "spec file" do
+      subject(:spec_file) { file("spec/requests/cars/drivers_controller_spec.rb") }
+
+      it { is_expected.to exist }
+
+      it "describe right routes for show" do
+        expect(spec_file).to contain('/cars/drivers/#{driver.id}')
+      end
+    end
+  end
+
+  context "when is scoped and nested resource" do
+    before do
+      run_generator ["Driver", "car:references", "name:string", "--scope", "api", "--father", "Cars"]
+    end
+
+    describe "spec file" do
+      subject(:spec_file) { file("spec/requests/api/cars/drivers_controller_spec.rb") }
+
+      it { is_expected.to exist }
+
+      it "describe right routes for show" do
+        expect(spec_file).to contain('/api/cars/#{car.id}/drivers/#{driver.id}')
+      end
+    end
+  end
+end