Fix api controller template with namespace and --model-name option

Author: kenzo-tanaka

lib/generators/rspec/scaffold/templates/api_controller_spec.rb

@@ -64,21 +64,21 @@
     context "with valid params" do
       it "creates a new <%= class_name %>" do
         expect {
-          post :create, params: {<%= ns_file_name %>: valid_attributes}, session: valid_session
+          post :create, params: {<%= singular_table_name %>: valid_attributes}, session: valid_session
         }.to change(<%= class_name %>, :count).by(1)
       end
 
-      it "renders a JSON response with the new <%= ns_file_name %>" do
-        post :create, params: {<%= ns_file_name %>: valid_attributes}, session: valid_session
+      it "renders a JSON response with the new <%= singular_table_name %>" do
+        post :create, params: {<%= singular_table_name %>: valid_attributes}, session: valid_session
         expect(response).to have_http_status(:created)
         expect(response.content_type).to eq('application/json')
-        expect(response.location).to eq(<%= ns_file_name %>_url(<%= class_name %>.last))
+        expect(response.location).to eq(<%= singular_table_name %>_url(<%= class_name %>.last))
       end
     end
 
     context "with invalid params" do
-      it "renders a JSON response with errors for the new <%= ns_file_name %>" do
-        post :create, params: {<%= ns_file_name %>: invalid_attributes}, session: valid_session
+      it "renders a JSON response with errors for the new <%= singular_table_name %>" do
+        post :create, params: {<%= singular_table_name %>: invalid_attributes}, session: valid_session
         expect(response).to have_http_status(:unprocessable_entity)
         expect(response.content_type).to eq('application/json')
       end
@@ -91,33 +91,33 @@
         skip("Add a hash of attributes valid for your model")
       }
 
-      it "updates the requested <%= ns_file_name %>" do
+      it "updates the requested <%= singular_table_name %>" do
         <%= file_name %> = <%= class_name %>.create! valid_attributes
-        put :update, params: {id: <%= file_name %>.to_param, <%= ns_file_name %>: new_attributes}, session: valid_session
+        put :update, params: {id: <%= file_name %>.to_param, <%= singular_table_name %>: new_attributes}, session: valid_session
         <%= file_name %>.reload
         skip("Add assertions for updated state")
       end
 
-      it "renders a JSON response with the <%= ns_file_name %>" do
+      it "renders a JSON response with the <%= singular_table_name %>" do
         <%= file_name %> = <%= class_name %>.create! valid_attributes
-        put :update, params: {id: <%= file_name %>.to_param, <%= ns_file_name %>: valid_attributes}, session: valid_session
+        put :update, params: {id: <%= file_name %>.to_param, <%= singular_table_name %>: valid_attributes}, session: valid_session
         expect(response).to have_http_status(:ok)
         expect(response.content_type).to eq('application/json')
       end
     end
 
     context "with invalid params" do
-      it "renders a JSON response with errors for the <%= ns_file_name %>" do
+      it "renders a JSON response with errors for the <%= singular_table_name %>" do
         <%= file_name %> = <%= class_name %>.create! valid_attributes
-        put :update, params: {id: <%= file_name %>.to_param, <%= ns_file_name %>: invalid_attributes}, session: valid_session
+        put :update, params: {id: <%= file_name %>.to_param, <%= singular_table_name %>: invalid_attributes}, session: valid_session
         expect(response).to have_http_status(:unprocessable_entity)
         expect(response.content_type).to eq('application/json')
       end
     end
   end
 
   describe "DELETE #destroy" do
-    it "destroys the requested <%= ns_file_name %>" do
+    it "destroys the requested <%= singular_table_name %>" do
       <%= file_name %> = <%= class_name %>.create! valid_attributes
       expect {
         delete :destroy, params: {id: <%= file_name %>.to_param}, session: valid_session

spec/generators/rspec/scaffold/scaffold_generator_spec.rb

@@ -102,8 +102,8 @@
   describe 'namespaced request spec' do
     subject { file('spec/requests/admin/posts_spec.rb') }
 
-    describe 'with no options' do
-      before  { run_generator %w[admin/posts] }
+    describe 'with default options' do
+      before { run_generator %w[admin/posts] }
       it { is_expected.to exist }
       it { is_expected.to contain(/^RSpec.describe "\/admin\/posts", #{type_metatag(:request)}/) }
       it { is_expected.to contain('post admin_posts_url, params: { admin_post: valid_attributes }') }
@@ -112,7 +112,7 @@
     end
 
     describe 'with --model-name' do
-      before  { run_generator %w[admin/posts --model-name=post] }
+      before { run_generator %w[admin/posts --model-name=post] }
       it { is_expected.to contain('post admin_posts_url, params: { post: valid_attributes }') }
       it { is_expected.not_to contain('params: { admin_post: valid_attributes }') }
       it { is_expected.to contain(' Post.create') }
@@ -137,19 +137,34 @@
   describe 'namespaced controller spec' do
     subject { file('spec/controllers/admin/posts_controller_spec.rb') }
 
-    describe 'with no options' do
-      before  { run_generator %w[admin/posts --controller_specs] }
+    describe 'with default options' do
+      before { run_generator %w[admin/posts --controller_specs] }
       it { is_expected.to contain(/^RSpec.describe Admin::PostsController, #{type_metatag(:controller)}/) }
       it { is_expected.to contain('post :create, params: {admin_post: valid_attributes}') }
       it { is_expected.to contain('Admin::Post.create') }
     end
 
     describe 'with --model-name' do
-      before  { run_generator %w[admin/posts --model-name=post --controller_specs] }
+      before { run_generator %w[admin/posts --model-name=post --controller_specs] }
       it { is_expected.to contain('post :create, params: {post: valid_attributes}') }
       it { is_expected.not_to contain('params: {admin_post: valid_attributes}') }
       it { is_expected.to contain(' Post.create') }
     end
+
+    context 'with --api' do
+      describe 'with default options' do
+        before { run_generator %w[admin/posts --api --controller_specs] }
+        it { is_expected.to contain('post :create, params: {admin_post: valid_attributes}') }
+        it { is_expected.to contain('Admin::Post.create') }
+      end
+
+      describe 'with --model-name' do
+        before { run_generator %w[admin/posts --api --model-name=post --controller_specs] }
+        it { is_expected.to contain('post :create, params: {post: valid_attributes}') }
+        it { is_expected.not_to contain('params: {admin_post: valid_attributes}') }
+        it { is_expected.to contain(' Post.create') }
+      end
+    end
   end
 
   describe 'view specs' do