rspec_rails_scaffold_templates 2.3 → 3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad10fd3f93fc8e6f8bc9fc57b2558e33ec8f37fdbdcb031d303d1aed0ba1d7b0
-  data.tar.gz: 83117df7955ca4577567cf6c996c8ad14de395d9cdd0df1b6382a644b923a156
+  metadata.gz: eac43d4dbda7c0184d1530a02e53374a4e68a8819d64ee82f684106e7add14d7
+  data.tar.gz: 895477e980276a655294a1cbcabdea7e38a77bccad9075129ad11a1d9b1165e6
 SHA512:
-  metadata.gz: 621656d22d2a62138abb3879dd144d66c87893836bbf921e0f50e2488dc1a487d65a720a61825688334c9dbe64ffe9b50c56e691ade7ea5965df80e022b6be55
-  data.tar.gz: 48e92b04edce2e1f538d6b754091b6d601af28e5ce50a21deccccc2a91f2f70abeae4368bd3a9408f9f41e42373e60e58eae5fab5234b7f7a995d3b521c00f0e
+  metadata.gz: 0ef790015a289fbdcc9b95003ce09520fb49a29d40d9e29b1279474c48af1e808b00e66db7b2752486fcdc4d20776a5141a20d2d14e9cae1a6101de3b006621d
+  data.tar.gz: e777a1104fa6c916a600b2034a3d4dddaccc47953ed46355c032c32b822d0f6298db5905a9b4c6d389068dbea506348ce9aff90a85c66d7e0dd0d56ff0c04ce3

data/VERSION

@@ -1 +1 @@
-2.3
+3.0

data/lib/rspec_rails_scaffold_templates.rb

@@ -1,3 +1,5 @@
+require 'rails/generators'
+
 if defined?(Rails)
   require 'rspec_rails_scaffold_templates/generators/scaffold_generator'
   require 'rspec_rails_scaffold_templates/generators/integration_generator'

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

@@ -26,7 +26,7 @@ describe Api::<%= options[:api_version].camelcase + '::' if options[:api_version
 <% if links.present? -%>
   let(:valid_attributes) do
     attributes_for(:<%=file_name%>)
-      .slice(*%w[<%= attribute_name %>].map(&:to_sym))
+      .slice(*%i[<%= attribute_name %>])
       .merge(
 <% links.each do |relation| -%>
         <%= relation.name %>_id: create(:<%= relation.name %>).id,
@@ -34,7 +34,7 @@ describe Api::<%= options[:api_version].camelcase + '::' if options[:api_version
       )
   end
 <% else -%>
-  let(:valid_attributes) {attributes_for(:<%=file_name%>).slice *%w[<%= attribute_name %>].map(&:to_sym)}
+  let(:valid_attributes) {attributes_for(:<%=file_name%>).slice *%i[<%= attribute_name %>]}
 <% end -%>
 <% else -%>
 <% factory_bot = false -%>

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

@@ -26,7 +26,7 @@ describe <%= controller_class_name %>Controller, <%= type_metatag(:controller) %
 <% if links.present? -%>
   let(:valid_attributes) do
     attributes_for(:<%=file_name%>)
-      .slice(*%w[<%= attribute_name %>].map(&:to_sym))
+      .slice(*%i[<%= attribute_name %>])
       .merge(
 <% links.each do |relation| -%>
         <%= relation.name %>_id: create(:<%= relation.name %>).id,
@@ -34,7 +34,7 @@ describe <%= controller_class_name %>Controller, <%= type_metatag(:controller) %
       )
   end
 <% else -%>
-  let(:valid_attributes) {attributes_for(:<%=file_name%>).slice *%w[<%= attribute_name %>].map(&:to_sym)}
+  let(:valid_attributes) {attributes_for(:<%=file_name%>).slice *%i[<%= attribute_name %>]}
 <% end -%>
 <% else -%>
 <% factory_bot = false -%>

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

@@ -38,12 +38,12 @@ describe "<%= ns_table_name %>/index", <%= type_metatag(:view) %> do
 <% for attribute in output_attributes -%>
 <% if Rails.application.config.generators.options[:rails][:fixture_replacement] == :factory_bot -%>
 <% if attribute.reference? -%>
-    assert_select 'tr>td', text: <%= ns_file_name %>.<%= attribute.name %>.name, count: 1
+    assert_select 'tr>td.<%= attribute.name %>', text: <%= ns_file_name %>.<%= attribute.name %>.name, count: 1
 <% else -%>
-    assert_select 'tr>td', text: <%= ns_file_name %>.<%= attribute.name %>.to_s, count: 1
+    assert_select 'tr>td.<%= attribute.name %>', text: <%= ns_file_name %>.<%= attribute.name %>.to_s, count: 1
 <% end -%>
 <% else -%>
-    assert_select "tr>td", text: <%= value_for(attribute) %>.to_s, count: 1
+    assert_select "tr>td.<%= attribute.name %>", text: <%= value_for(attribute) %>.to_s, count: 1
 <% end -%>
 <% end -%>
   end
@@ -56,12 +56,12 @@ describe "<%= ns_table_name %>/index", <%= type_metatag(:view) %> do
 <% for attribute in output_attributes -%>
 <% if Rails.application.config.generators.options[:rails][:fixture_replacement] == :factory_bot -%>
 <% if attribute.reference? -%>
-    assert_select 'tr>td', text: <%= ns_file_name %>.<%= attribute.name %>.name, count: 1
+    assert_select 'tr>td.<%= attribute.name %>', text: <%= ns_file_name %>.<%= attribute.name %>.name, count: 1
 <% else -%>
-    assert_select 'tr>td', text: <%= ns_file_name %>.<%= attribute.name %>.to_s, count: 1
+    assert_select 'tr>td.<%= attribute.name %>', text: <%= ns_file_name %>.<%= attribute.name %>.to_s, count: 1
 <% end -%>
 <% else -%>
-    assert_select "tr>td", text: <%= value_for(attribute) %>.to_s, count: 1
+    assert_select "tr>td.<%= attribute.name %>", text: <%= value_for(attribute) %>.to_s, count: 1
 <% end -%>
 <% end -%>
   end

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

@@ -0,0 +1,205 @@
+require 'rails_helper'
+
+# This spec was generated by rspec-rails when you ran the scaffold generator.
+# It demonstrates how one might use RSpec to test the controller code that
+# was generated by Rails when you ran the scaffold generator.
+#
+# It assumes that the implementation code is generated by the rails scaffold
+# generator. If you are using any extension libraries to generate different
+# controller code, this generated spec may or may not pass.
+#
+# It only uses APIs available in rails and/or rspec-rails. There are a number
+# of tools you can use to make these specs even more expressive, but we're
+# sticking to rails and rspec-rails APIs to keep things simple and stable.
+
+<% module_namespacing do -%>
+describe "/<%= name.underscore.pluralize %>", <%= type_metatag(:request) %> do
+<% if method = Rails.application.config.generators.options[:rails][:cancan] -%>
+<% method = 'current_user' unless Symbol === method -%>
+  before :each do
+    allow_any_instance_of(<%= controller_class_name %>Controller).to receive(:<%=method%>)
+        .and_return(<%=method%>)
+  end
+
+<% end -%>
+  # This should return the minimal set of attributes required to create a valid
+  # <%= class_name %>. As you add validations to <%= class_name %>, be sure to
+  # adjust the attributes here as well. The list could not be empty.
+<% links = attributes.select{|a| [:belongs_to, :references].include? a.type} -%>
+<% attribute = (attributes - links).detect{|a| a.name == 'name' || a.name == 'title' || a.name == 'code' || a.name =~ /name/ || a.name =~ /title/} || attributes.first -%>
+<% attribute_name = attribute.respond_to?(:column_name) ? attribute.column_name : attribute.name -%>
+<% if Rails.application.config.generators.options[:rails][:fixture_replacement] == :factory_bot -%>
+<% factory_bot = true -%>
+  let(:<%= file_name %>) {create :<%= file_name %>}
+
+<% if links.present? -%>
+  let(:valid_attributes) do
+    attributes_for(:<%=file_name%>)
+      .slice(*%i[<%= attribute_name %>])
+      .merge(
+<% links.each do |relation| -%>
+        <%= relation.name %>_id: create(:<%= relation.name %>).id,
+<% end -%>
+      )
+  end
+<% else -%>
+  let(:valid_attributes) {attributes_for(:<%=file_name%>).slice *%i[<%= attribute_name %>]}
+<% end -%>
+<% else -%>
+<% factory_bot = false -%>
+  let(:<%= file_name %>) {<%= class_name %>.create! valid_attributes}
+
+  let(:valid_attributes) do
+    skip("Add a hash of attributes valid for your model")
+  end
+<% end -%>
+
+  let(:invalid_attributes) do
+    # {<%= attribute_name %>: ''}
+    skip("Add a hash of attributes invalid for your model")
+  end
+
+<% 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
+      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
+      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
+      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
+      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_create}.to change(<%= class_name %>, :count).by(1)
+      end
+
+      it "redirects to the created <%= ns_file_name %>" do
+        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_create}.not_to change(<%= class_name %>, :count)
+      end
+
+      it "renders a successful response (i.e. to display the 'new' template)" do
+        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(:attributes) { {<%= attribute_name %>: 'New value'} }
+
+      it "updates the requested <%= ns_file_name %>" do
+        # expect_any_instance_of(<%= class_name %>)
+        #   .to receive(:update).with(attributes.inject({}){|_, (k, v)| _[k] = v.to_s; _})
+<% unless factory_bot -%>
+        <%= file_name %> = <%= class_name %>.create! valid_attributes
+<% end -%>
+        patch_update
+        <%= file_name %>.reload
+        # skip("Add assertions for updated state")
+        expect(<%= file_name %>.<%= attribute_name %>).to eq 'New value'
+      end
+
+      it "redirects to the <%= ns_file_name %>" do
+<% unless factory_bot -%>
+        <%= file_name %> = <%= class_name %>.create! valid_attributes
+<% end -%>
+        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_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_destroy}.to change(<%= class_name %>, :count).by(-1)
+    end
+
+    it "redirects to the <%= table_name %> list" do
+<% if factory_bot -%>
+      <%= file_name %>
+<% else -%>
+      <%= file_name %> = <%= class_name %>.create! valid_attributes
+<% end -%>
+      delete_destroy
+      expect(response).to redirect_to(<%= index_helper %>_url)
+    end
+  end
+end
+<% end -%>

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

@@ -32,12 +32,12 @@ describe "<%= ns_table_name %>/show", <%= type_metatag(:view) %> do
 <% for attribute in output_attributes -%>
 <% if Rails.application.config.generators.options[:rails][:fixture_replacement] == :factory_bot -%>
 <% if attribute.reference? -%>
-    assert_select 'dl>dd', text: Regexp.new(<%= ns_file_name %>.<%= attribute.name %>.name)
+    assert_select 'dl>dd.<%= attribute.name %>', text: Regexp.new(<%= ns_file_name %>.<%= attribute.name %>.name)
 <% else -%>
-    assert_select 'dl>dd', text: Regexp.new(<%= ns_file_name %>.<%= attribute.name %>.to_s)
+    assert_select 'dl>dd.<%= attribute.name %>', text: Regexp.new(<%= ns_file_name %>.<%= attribute.name %>.to_s)
 <% end -%>
 <% else -%>
-    assert_select 'dl>dd', text: <%= value_for(attribute) %>
+    assert_select 'dl>dd.<%= attribute.name %>', text: <%= value_for(attribute) %>
 <% end -%>
 <% 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.3 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.3"
+  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 = "2019-05-22"
+  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 = [
@@ -35,6 +35,7 @@ Gem::Specification.new do |s|
     "lib/rspec_rails_scaffold_templates/generators/templates/rspec/scaffold/edit_spec.rb",
     "lib/rspec_rails_scaffold_templates/generators/templates/rspec/scaffold/index_spec.rb",
     "lib/rspec_rails_scaffold_templates/generators/templates/rspec/scaffold/new_spec.rb",
+    "lib/rspec_rails_scaffold_templates/generators/templates/rspec/scaffold/request_spec.rb",
     "lib/rspec_rails_scaffold_templates/generators/templates/rspec/scaffold/show_spec.rb",
     "rspec_rails_scaffold_templates.gemspec",
     "spec/rspec_rails_scaffold_templates_spec.rb",
@@ -42,25 +43,19 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/dima4p/rspec_rails_scaffold_templates".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "3.0.3".freeze
+  s.rubygems_version = "3.1.2".freeze
   s.summary = "RSpec scaffold generator templates that use FactoryGirl and WiceGrid".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
+  end
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>.freeze, ["~> 3.1"])
-      s.add_development_dependency(%q<rdoc>.freeze, ["~> 4.1"])
-      s.add_development_dependency(%q<bundler>.freeze, ["~> 1.6"])
-      s.add_development_dependency(%q<jeweler>.freeze, ["~> 2.0"])
-      s.add_development_dependency(%q<simplecov>.freeze, ["~> 0.0"])
-    else
-      s.add_dependency(%q<rspec>.freeze, ["~> 3.1"])
-      s.add_dependency(%q<rdoc>.freeze, ["~> 4.1"])
-      s.add_dependency(%q<bundler>.freeze, ["~> 1.6"])
-      s.add_dependency(%q<jeweler>.freeze, ["~> 2.0"])
-      s.add_dependency(%q<simplecov>.freeze, ["~> 0.0"])
-    end
+  if s.respond_to? :add_runtime_dependency then
+    s.add_development_dependency(%q<rspec>.freeze, ["~> 3.1"])
+    s.add_development_dependency(%q<rdoc>.freeze, ["~> 4.1"])
+    s.add_development_dependency(%q<bundler>.freeze, ["~> 1.6"])
+    s.add_development_dependency(%q<jeweler>.freeze, ["~> 2.0"])
+    s.add_development_dependency(%q<simplecov>.freeze, ["~> 0.0"])
   else
     s.add_dependency(%q<rspec>.freeze, ["~> 3.1"])
     s.add_dependency(%q<rdoc>.freeze, ["~> 4.1"])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec_rails_scaffold_templates
 version: !ruby/object:Gem::Version
-  version: '2.3'
+  version: '3.0'
 platform: ruby
 authors:
 - Dmitri Koulikoff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-22 00:00:00.000000000 Z
+date: 2020-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -104,6 +104,7 @@ files:
 - lib/rspec_rails_scaffold_templates/generators/templates/rspec/scaffold/edit_spec.rb
 - lib/rspec_rails_scaffold_templates/generators/templates/rspec/scaffold/index_spec.rb
 - lib/rspec_rails_scaffold_templates/generators/templates/rspec/scaffold/new_spec.rb
+- lib/rspec_rails_scaffold_templates/generators/templates/rspec/scaffold/request_spec.rb
 - lib/rspec_rails_scaffold_templates/generators/templates/rspec/scaffold/show_spec.rb
 - rspec_rails_scaffold_templates.gemspec
 - spec/rspec_rails_scaffold_templates_spec.rb
@@ -127,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: RSpec scaffold generator templates that use FactoryGirl and WiceGrid