rspec_rails_scaffold_templates 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f982fe261637a4ab99e15cc24889b60db4765876
-  data.tar.gz: 0bb37e0440f76d66870f5bc6f7e01ea547ee6ad2
+  metadata.gz: ffb4fae5fdbaa457cb47a0332c2f3c86f678a46c
+  data.tar.gz: 65813cf867467749f143b7f62f0d2bec6015f446
 SHA512:
-  metadata.gz: 8336372d6ab8731510d91fe2b250f5710b785aaeeb911149bfb8f13d7a2bf95ecc4a80760c67b4bd04d9c445c877e76ae7256792a9c660fe7e58112dc4261f62
-  data.tar.gz: 5dc1f502e60872e8e5e83bac3b50709077d95c33c1d17f0e1c5f6a86d4171780bd9be4944d55fc892f6fe3c05f22af3874eb2549fe13fca3095fc64964eb5aa9
+  metadata.gz: 3f11b3cf92859d0825ffb866db3ae7897321448d91e11a637d24b853576937f897af626fb67c572d6d0c8bc9543c2c47ff3ebe869bc50adc2c405fba8e09ffc3
+  data.tar.gz: 0876d94af444e23c056d0c1159b7d626b0136b8525f65a1e2666c79789be6ca9a430fc0c9f5aa715f80203f18c4af0e3c1cf86f44ad0a676c0d937a47545b659

data/VERSION

@@ -1 +1 @@
-1.0.7
+1.0.8

data/lib/templates/rspec/integration/request_spec.rb

@@ -5,10 +5,12 @@ require 'spec_helper'
 <% end -%>
 
 describe "<%= class_name.pluralize %>", type: :request do
+<% if Rails.application.config.generators.options[:rails][:cancan] -%>
   before :each do
     allow_any_instance_of(<%= class_name.pluralize %>Controller).to receive(:current_user).and_return(current_user)
   end
 
+<% end -%>
   describe "GET /<%= table_name %>" do
     it "works! (now write some real specs)" do
       get <%= index_helper %>_path

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

@@ -7,10 +7,12 @@ require 'spec_helper'
 <% module_namespacing do -%>
 describe <%= controller_class_name %>Controller, type: :controller do
 
+<% if Rails.application.config.generators.options[:rails][:cancan] -%>
   before :each do
     allow(controller).to receive(:current_user).and_return(current_user)
   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.

data/lib/templates/rspec/scaffold/edit_spec.rb

@@ -7,7 +7,9 @@ require 'spec_helper'
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
 describe "<%= ns_table_name %>/edit", type: :view do
   before(:each) do
+<% if Rails.application.config.generators.options[:rails][:cancan] -%>
     allow(controller).to receive(:can?).and_return(true)
+<% end -%>
 <% if Rails.application.config.generators.options[:rails][:fixture_replacement] == :factory_girl -%>
     @<%= ns_file_name %> = assign(:<%= ns_file_name %>, create(:<%= ns_file_name %>))
 <% else -%>

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

@@ -7,7 +7,9 @@ require 'spec_helper'
 <% output_attributes = attributes.reject{|attribute| [:created_at, :deleted_at, :updated_at].index(attribute.name) or attribute.password_digest? } -%>
 describe "<%= ns_table_name %>/index", type: :view do
   before(:each) do
+<% if Rails.application.config.generators.options[:rails][:cancan] -%>
     allow(controller).to receive(:can?).and_return(true)
+<% end -%>
 <% if options[:fixture_replacement] == :factory_girl -%>
   # options[:fixture_replacement] == :factory_girl
 <% end -%>
@@ -16,6 +18,7 @@ describe "<%= ns_table_name %>/index", type: :view do
     @<%= ns_file_name %> = create(:<%= ns_file_name %>)
 <% if not defined? Wice::WiceGrid -%>
     assign(:<%= table_name %>, [@<%= ns_file_name %>, @<%= ns_file_name %>])
+<% size = 2 -%>
 <% end -%>
 <% else -%>
 <% size = 2 -%>

data/lib/templates/rspec/scaffold/new_spec.rb

@@ -7,7 +7,9 @@ require 'spec_helper'
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
 describe "<%= ns_table_name %>/new", type: :view do
   before(:each) do
+<% if Rails.application.config.generators.options[:rails][:cancan] -%>
     allow(controller).to receive(:can?).and_return(true)
+<% end -%>
 <% if Rails.application.config.generators.options[:rails][:fixture_replacement] == :factory_girl -%>
     @<%= ns_file_name %> = assign(:<%= ns_file_name %>, build(:<%= ns_file_name %>))
   end

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

@@ -7,7 +7,9 @@ require 'spec_helper'
 <% output_attributes = attributes.reject{|attribute| [:created_at, :deleted_at, :updated_at].index(attribute.name) or attribute.password_digest? } -%>
 describe "<%= ns_table_name %>/show", type: :view do
   before(:each) do
+<% if Rails.application.config.generators.options[:rails][:cancan] -%>
     allow(controller).to receive(:can?).and_return(true)
+<% end -%>
 <% if Rails.application.config.generators.options[:rails][:fixture_replacement] == :factory_girl -%>
     @<%= ns_file_name %> = assign(:<%= ns_file_name %>, create(:<%= ns_file_name %>))
 <% else -%>

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 1.0.7 ruby lib
+# stub: rspec_rails_scaffold_templates 1.0.8 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "rspec_rails_scaffold_templates"
-  s.version = "1.0.7"
+  s.version = "1.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Dmitri Koulikoff"]
-  s.date = "2015-02-25"
+  s.date = "2015-06-14"
   s.description = "RSpec scaffold generator templates that use FactoryGirl and WiceGrid"
   s.email = "dima@koulikoff.ru"
   s.extra_rdoc_files = [
@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/dima4p/rspec_rails_scaffold_templates"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.4.5"
+  s.rubygems_version = "2.2.2"
   s.summary = "RSpec scaffold generator templates that use FactoryGirl and WiceGrid"
 
   if s.respond_to? :specification_version then

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec_rails_scaffold_templates
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Dmitri Koulikoff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-25 00:00:00.000000000 Z
+date: 2015-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: RSpec scaffold generator templates that use FactoryGirl and WiceGrid