rspec_rails_scaffold_templates 2.9 → 3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ec8ea48a6ea7009069519882ce7e773352bd849024ee27fe07b69b107e3d350
-  data.tar.gz: 00f96f62cb04489429c4fc98b8fa84a23762eb583e405b7b707994bf068ad09d
+  metadata.gz: eac43d4dbda7c0184d1530a02e53374a4e68a8819d64ee82f684106e7add14d7
+  data.tar.gz: 895477e980276a655294a1cbcabdea7e38a77bccad9075129ad11a1d9b1165e6
 SHA512:
-  metadata.gz: afad47b879090bfef2738163d772a15a4ad9674614be6c94c1881da7b6d0ee16583760f36b57fb7d15e93af427eb5a2fcf1dedfa71ff643e070f4c70cf804aa7
-  data.tar.gz: 257fc01ef8153da000b22f844897bce3944c6ea8037446a038405f308fc82339ed4c717ed6fbe12f154784a28901ef46aec67a5a2e1bf8d73f7dfec52b3dde33
+  metadata.gz: 0ef790015a289fbdcc9b95003ce09520fb49a29d40d9e29b1279474c48af1e808b00e66db7b2752486fcdc4d20776a5141a20d2d14e9cae1a6101de3b006621d
+  data.tar.gz: e777a1104fa6c916a600b2034a3d4dddaccc47953ed46355c032c32b822d0f6298db5905a9b4c6d389068dbea506348ce9aff90a85c66d7e0dd0d56ff0c04ce3

data/VERSION

@@ -1 +1 @@
-2.9
+3.0

data/lib/rspec_rails_scaffold_templates/generators/templates/rspec/scaffold/request_spec.rb

@@ -61,80 +61,96 @@ describe "/<%= name.underscore.pluralize %>", <%= type_metatag(:request) %> do
 
 <% unless options[:singleton] -%>
   describe "GET /index" do
+    subject(:get_index) {get <%= index_helper %>_url}
+
     it "renders a successful response" do
       <%= class_name %>.create! valid_attributes
-      get <%= index_helper %>_url
+      get_index
       expect(response).to be_successful
     end
   end
 <% end -%>
 
   describe "GET /show" do
+    subject(:get_show) {get <%= show_helper.sub(/@([^)]+)/, 'id: \1.to_param') %>}
+
     it "renders a successful response" do
 <% unless factory_bot -%>
       <%= file_name %> = <%= class_name %>.create! valid_attributes
 <% end -%>
-      get <%= show_helper.sub(/@([^)]+)/, 'id: \1.to_param') %>
+      get_show
       expect(response).to be_successful
     end
   end
 
   describe "GET /new" do
+    subject(:get_new) {get <%= new_helper %>}
+
     it "renders a successful response" do
-      get <%= new_helper %>
+      get_new
       expect(response).to be_successful
     end
   end
 
   describe "GET /edit" do
+    subject(:get_edit) {get <%= edit_helper.sub(/@([^)]*)/, 'id: \1.to_param') %>}
+
     it "render a successful response" do
 <% unless factory_bot -%>
       <%= file_name %> = <%= class_name %>.create! valid_attributes
 <% end -%>
-      get <%= edit_helper.tr('@','id: ') %>
+      get_edit
       expect(response).to be_successful
     end
   end
 
   describe "POST /create" do
+    subject(:post_create) do
+      post <%= index_helper %>_url, params: { <%= ns_file_name %>: attributes }
+    end
+
     context "with valid parameters" do
+      let(:attributes) {valid_attributes}
+
       it "creates a new <%= class_name %>" do
-        expect {
-          post <%= index_helper %>_url, params: { <%= ns_file_name %>: valid_attributes }
-        }.to change(<%= class_name %>, :count).by(1)
+        expect{post_create}.to change(<%= class_name %>, :count).by(1)
       end
 
       it "redirects to the created <%= ns_file_name %>" do
-        post <%= index_helper %>_url, params: { <%= ns_file_name %>: valid_attributes }
-        expect(response).to redirect_to(<%= show_helper.gsub("\@#{file_name}", class_name+".last") %>)
+        post_create
+        expect(response).to redirect_to(<%= show_helper.gsub("\@#{file_name}", 'id: ' + class_name + ".last.to_param") %>)
       end
     end
 
     context "with invalid parameters" do
+      let(:attributes) {invalid_attributes}
+
       it "does not create a new <%= class_name %>" do
-        expect {
-          post <%= index_helper %>_url, params: { <%= ns_file_name %>: invalid_attributes }
-        }.to change(<%= class_name %>, :count).by(0)
+        expect {post_create}.not_to change(<%= class_name %>, :count)
       end
 
       it "renders a successful response (i.e. to display the 'new' template)" do
-        post <%= index_helper %>_url, params: { <%= ns_file_name %>: invalid_attributes }
+        post_create
         expect(response).to be_successful
       end
     end
   end
 
   describe "PATCH /update" do
+    subject(:patch_update) do
+      patch <%= show_helper.sub(/@([^)]+)/, 'id: \1.to_param') %>, params: { <%= singular_table_name %>: attributes }
+    end
+
     context "with valid parameters" do
-      let(:new_attributes) { {<%= attribute_name %>: 'New value'} }
+      let(:attributes) { {<%= attribute_name %>: 'New value'} }
 
       it "updates the requested <%= ns_file_name %>" do
         # expect_any_instance_of(<%= class_name %>)
-        #   .to receive(:update).with(new_attributes.inject({}){|_, (k, v)| _[k] = v.to_s; _})
+        #   .to receive(:update).with(attributes.inject({}){|_, (k, v)| _[k] = v.to_s; _})
 <% unless factory_bot -%>
         <%= file_name %> = <%= class_name %>.create! valid_attributes
 <% end -%>
-        patch <%= show_helper.sub(/@([^)]+)/, 'id: \1.to_param') %>, params: { <%= singular_table_name %>: new_attributes }
+        patch_update
         <%= file_name %>.reload
         # skip("Add assertions for updated state")
         expect(<%= file_name %>.<%= attribute_name %>).to eq 'New value'
@@ -144,33 +160,35 @@ describe "/<%= name.underscore.pluralize %>", <%= type_metatag(:request) %> do
 <% unless factory_bot -%>
         <%= file_name %> = <%= class_name %>.create! valid_attributes
 <% end -%>
-        patch <%= show_helper.sub(/@([^)]+)/, 'id: \1.to_param') %>, params: { <%= singular_table_name %>: new_attributes }
+        patch_update
         <%= file_name %>.reload
         expect(response).to redirect_to(<%= singular_table_name %>_url(id: <%= file_name %>.to_param))
       end
     end
 
     context "with invalid parameters" do
+      let(:attributes) {invalid_attributes}
+
       it "renders a successful response (i.e. to display the 'edit' template)" do
 <% unless factory_bot -%>
         <%= file_name %> = <%= class_name %>.create! valid_attributes
 <% end -%>
-        patch <%= show_helper.sub(/@([^)]+)/, 'id: \1.to_param') %>, params: { <%= singular_table_name %>: invalid_attributes }
+        patch_update
         expect(response).to be_successful
       end
     end
   end
 
   describe "DELETE /destroy" do
+    subject(:delete_destroy) {delete <%= show_helper.sub(/@([^)]+)/, 'id: \1.to_param') %>}
+
     it "destroys the requested <%= ns_file_name %>" do
 <% if factory_bot -%>
       <%= file_name %>
 <% else -%>
       <%= file_name %> = <%= class_name %>.create! valid_attributes
 <% end -%>
-      expect {
-        delete <%= show_helper.sub(/@([^)]+)/, 'id: \1.to_param') %>
-      }.to change(<%= class_name %>, :count).by(-1)
+      expect {delete_destroy}.to change(<%= class_name %>, :count).by(-1)
     end
 
     it "redirects to the <%= table_name %> list" do
@@ -179,7 +197,7 @@ describe "/<%= name.underscore.pluralize %>", <%= type_metatag(:request) %> do
 <% else -%>
       <%= file_name %> = <%= class_name %>.create! valid_attributes
 <% end -%>
-      delete <%= show_helper.sub(/@([^)]+)/, 'id: \1.to_param') %>
+      delete_destroy
       expect(response).to redirect_to(<%= index_helper %>_url)
     end
   end

data/rspec_rails_scaffold_templates.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: rspec_rails_scaffold_templates 2.9 ruby lib
+# stub: rspec_rails_scaffold_templates 3.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "rspec_rails_scaffold_templates".freeze
-  s.version = "2.9"
+  s.version = "3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Dmitri Koulikoff".freeze]
-  s.date = "2020-06-05"
+  s.date = "2020-06-17"
   s.description = "RSpec scaffold generator templates that use FactoryGirl and WiceGrid".freeze
   s.email = "dima@koulikoff.ru".freeze
   s.extra_rdoc_files = [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec_rails_scaffold_templates
 version: !ruby/object:Gem::Version
-  version: '2.9'
+  version: '3.0'
 platform: ruby
 authors:
 - Dmitri Koulikoff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-05 00:00:00.000000000 Z
+date: 2020-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec