leonardo 1.5.0 → 1.6.0

data/lib/generators/leolay/install_generator.rb

@@ -9,7 +9,6 @@ module Leolay
         copy_file "leolay/leolay_generator.rb", "lib/generators/leolay/leolay_generator.rb"
         copy_file "leolay/USAGE", "lib/generators/leolay/USAGE"
         directory "leolay/templates", "lib/generators/leolay/templates"
-        #copy_file "leonardo_shared.rb", "lib/generators/leonardo_shared.rb" unless File.exists? "lib/generators/leonardo_shared.rb"
       end
     end
   end

data/lib/generators/leolay/leolay_generator.rb

@@ -1,20 +1,20 @@
 class LeolayGenerator < Rails::Generators::Base
   source_root File.expand_path('../templates', __FILE__)
   argument :style, :type => :string, :default => "cloudy"
-  class_option :pagination, :type => :boolean, :default => true, :description => "Include pagination files"
-  class_option :main_color, :type => :string, :default => nil, :description => "Force a main color for the stylesheet"
-  class_option :second_color, :type => :string, :default => nil, :description => "Force a secondary color for the stylesheet"
-  class_option :authentication, :type => :boolean, :default => true, :description => "Add code to manage authentication with devise"
-  class_option :authorization, :type => :boolean, :default => true, :description => "Add code to manage authorization with cancan"
-  class_option :user_class, :type => :boolean, :default => 'user', :description => "Set the user class name"
-  class_option :formtastic, :type => :boolean, :default => true, :description => "Copy formtastic files into leosca custom folder (inside project)"
-  class_option :jquery_ui, :type => :boolean, :default => true, :description => "To use jQuery ui improvement"
-
+  class_option :pagination, :type => :boolean, :default => true, :desc => "Include pagination files"
+  class_option :main_color, :type => :string, :default => nil, :desc => "Force a main color for the stylesheet"
+  class_option :second_color, :type => :string, :default => nil, :desc => "Force a secondary color for the stylesheet"
+  class_option :authentication, :type => :boolean, :default => true, :desc => "Add code to manage authentication with devise"
+  class_option :authorization, :type => :boolean, :default => true, :desc => "Add code to manage authorization with cancan"
+  class_option :user_class, :type => :boolean, :default => 'user', :desc => "Set the user class name"
+  class_option :formtastic, :type => :boolean, :default => true, :desc => "Copy formtastic files into leosca custom folder (inside project)"
+  class_option :jquery_ui, :type => :boolean, :default => true, :desc => "To use jQuery ui improvement"
+  class_option :rspec, :type => :boolean, :default => true, :desc => "Include custom rspec generator and custom templates"
 
   def generate_layout
     template "config.rb", "config/initializers/config.rb"
 
-    template "styles/#{style_name}/stylesheet.sass", "app/assets/stylesheets/#{style_name}.sass"
+    template "styles/#{style_name}/stylesheets/app/stylesheet.sass", "app/assets/stylesheets/#{style_name}.sass"
 
     copy_file "layout_helper.rb", "app/helpers/layout_helper.rb"
 
@@ -76,7 +76,7 @@ class LeolayGenerator < Rails::Generators::Base
         config.generators do |g|
             g.stylesheets         false
             g.javascripts         false
-            g.leosca_controller :leosca_controller
+            g.leosca_controller   :leosca_controller
           end
 
           config.autoload_paths += %W(\#{config.root}/lib/extras)
@@ -185,15 +185,16 @@ class LeolayGenerator < Rails::Generators::Base
   def setup_formtastic
     return unless options.formtastic?
 
-    path = "vendor/assets/stylesheets/formtastic"
+    path = "styles/#{style_name}/stylesheets/vendor/formtastic"
+    dest_path = "vendor/assets/stylesheets/formtastic"
+
+    path = dest_path unless File.exists?(path)
+
     file = "#{path}/formtastic.css"
     copy_file file, file unless File.exists?(file)
     file = "#{path}/formtastic_changes.css"
     copy_file file, file
 
-    path = "vendor/assets/stylesheets/jquery-ui"
-    directory path, path
-
     file = "config/initializers/formtastic.rb"
     inject_into_file file, :after => "# Formtastic::SemanticFormBuilder.i18n_lookups_by_default = false" do
       <<-FILE.gsub(/^      /, '')
@@ -265,6 +266,8 @@ class LeolayGenerator < Rails::Generators::Base
     copy_file file, file
 
     if options.jquery_ui?
+      directory "styles/#{style_name}/stylesheets/vendor/jquery-ui", "vendor/assets/stylesheets/jquery-ui"
+
       file = "#{app_path}/application.css"
       inject_into_file file, :before => "*/" do
         <<-FILE.gsub(/^        /, '')
@@ -290,14 +293,14 @@ class LeolayGenerator < Rails::Generators::Base
 
   def setup_rspec
     file = "spec/spec_helper.rb"
-    return unless File.exists? file
+    return unless File.exists?(file) && options.rspec?
     inject_into_file file, :after => "require 'rspec/rails'" do
     <<-FILE.gsub(/^    /, '')
 
     require 'capybara/rspec'
     require 'helpers/application_helpers_spec'
 
-    Capybara.default_wait_time = 5 #default=2
+    Capybara.default_wait_time = 10 #default=2
     FILE
     end
 
@@ -332,6 +335,10 @@ class LeolayGenerator < Rails::Generators::Base
     copy_file file, file
     file = "lib/templates/rspec/scaffold"
     directory file, file
+    file = "lib/templates/rspec/scaffold"
+    directory file, file
+    file = "lib/generators/rspec/scaffold"
+    directory file, file
 
   end
 

data/lib/generators/leolay/templates/config/locales/devise.en.yml

@@ -27,6 +27,7 @@ en:
     passwords:
       send_instructions: 'You will receive an email with instructions about how to reset your password in a few minutes.'
       updated: 'Your password was changed successfully. You are now signed in.'
+      updated_not_active: 'Your password was changed successfully.'
       send_paranoid_instructions: "If your e-mail exists on our database, you will receive a password recovery link on your e-mail"
     confirmations:
       send_instructions: 'You will receive an email with instructions about how to confirm your account in a few minutes.'

data/lib/generators/leolay/templates/config/locales/devise.it.yml

@@ -25,6 +25,7 @@ it:
     passwords:
       send_instructions: "Riceverai un messaggio email con le istruzioni per reimpostare la tua password entro qualche minuto."
       updated: "La tua password è stata cambiata. Ora sei collegato."
+      updated_not_active: "La tua password è stata cambiata."
       send_paranoid_instructions: "Se il tuo indirizzo e-mail esiste nel nostro database, riceverai un link per il recupero della password."
     confirmations:
       send_instructions: "Riceverai un messaggio email con le istruzioni per confermare il tuo account entro qualche minuto."

data/lib/generators/leolay/templates/config/locales/en.yml

@@ -51,7 +51,7 @@ en:
     currency:
       format:
         # Where is the currency sign? %u is the currency unit, %n the number (default: $5.00)
-        format: "%u%n"
+        format: "%u %n"
         unit: "$"
         # These five are to override number.format and are optional
         separator: "."
@@ -179,9 +179,9 @@ en:
       prompt: "Please select"
     # Default translation keys for submit FormHelper
     submit:
-      create: 'Create %{model}'
-      update: 'Update %{model}'
-      submit: 'Save %{model}'
+      create: "Create %{model}"
+      update: "Update %{model}"
+      submit: "Save %{model}"
 
   activerecord: &activerecord
     models: &models
@@ -220,7 +220,7 @@ en:
     current_password: "Current password"
     new_password: "New password"
 
-  unknown_request: "Sorry, this request is unkown and cannot be processed"
+  unknown_request: "Sorry, this request is unknown and cannot be processed"
   generic_error: "An error was occured and doesn't permit to execute this operation"
   permission_denied: "You don't have authorization to perform this request."
   created: "%{model} was successfully created."

data/lib/generators/leolay/templates/config/locales/it.yml

@@ -57,8 +57,8 @@ it:
         format: "%n %u"
         unit: "€"
         # These five are to override number.format and are optional
-        separator: "."
-        delimiter: ","
+        separator: ","
+        delimiter: "."
         precision: 2
         significant: false
         strip_insignificant_zeros: false
@@ -177,9 +177,9 @@ it:
       prompt: "Seleziona ..."
     # Default translation keys for submit FormHelper
     submit:
-      create: 'Crea %{model}'
-      update: 'Aggiorna %{model}'
-      submit: 'Salva %{model}'
+      create: "Crea %{model}"
+      update: "Aggiorna %{model}"
+      submit: "Salva %{model}"
 
   activerecord: &activerecord
     models: &models

data/lib/generators/leolay/templates/lib/generators/rspec/scaffold/scaffold_generator.rb

@@ -0,0 +1,173 @@
+require 'generators/rspec'
+require 'rails/generators/resource_helpers'
+require 'generators/base' #leonardo base
+
+puts "*" * 22
+puts "Custom rspec generator"
+puts "*" * 22
+
+module Rspec
+  module Generators
+    class ScaffoldGenerator < Base
+      include Rails::Generators::ResourceHelpers
+      include ::Leonardo::Leosca
+      include ::Leonardo::Nested
+      include ::Leonardo::Nested::Test
+      source_paths << File.expand_path("../../helper/templates", __FILE__)
+      argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
+
+      class_option :orm, :desc => "ORM used to generate the controller"
+      class_option :template_engine, :desc => "Template engine to generate view files"
+      class_option :singleton, :type => :boolean, :desc => "Supply to create a singleton controller"
+
+      class_option :controller_specs, :type => :boolean, :default => true,  :desc => "Generate controller specs"
+      class_option :view_specs,       :type => :boolean, :default => true,  :desc => "Generate view specs"
+      #Leonardo includes custom views to support capybara
+      #class_option :webrat,           :type => :boolean, :default => false, :desc => "Use webrat methods/matchers"
+      #class_option :webrat_matchers,  :type => :boolean, :default => false, :desc => "Use webrat methods/matchers (deprecated - use --webrat)"
+      class_option :helper_specs,     :type => :boolean, :default => true,  :desc => "Generate helper specs"
+      class_option :routing_specs,    :type => :boolean, :default => true,  :desc => "Generate routing specs"
+
+      #Leonardo options
+      class_option :remote, :type => :boolean, :default => true, :desc => "It checks ajax sections"
+      class_option :under, :type => :string, :default => "", :banner => "brand/category", :desc => "Nested resources"
+
+      def generate_controller_spec
+        return unless options[:controller_specs]
+
+        template 'controller_spec.rb',
+                 File.join('spec/controllers', controller_class_path, "#{controller_file_name}_controller_spec.rb")
+      end
+
+      def generate_view_specs
+        return unless options[:view_specs]
+
+        copy_view :edit
+        copy_view :index unless options[:singleton]
+        copy_view :new
+        copy_view :show
+      end
+
+      # Invoke the helper using the controller name (pluralized)
+      hook_for :helper, :as => :scaffold do |invoked|
+        invoke invoked, [ controller_name ]
+      end
+
+      def generate_routing_spec
+        return unless options[:routing_specs]
+
+        template 'routing_spec.rb',
+          File.join('spec/routing', controller_class_path, "#{controller_file_name}_routing_spec.rb")
+      end
+
+      hook_for :integration_tool, :as => :integration
+
+      protected
+
+        def webrat?
+          RSpec.deprecate("--webrat-matchers", "--webrat") if options[:webrat_matchers]
+          options[:webrat] || options[:webrat_matchers]
+        end
+
+        def copy_view(view)
+          template "#{view}_spec.rb",
+                   File.join("spec/views", controller_file_path, "#{view}.html.#{options[:template_engine]}_spec.rb")
+        end
+
+        def params
+          "{'these' => 'params'}"
+        end
+
+        # support for namespaced-resources
+        def ns_file_name
+          if ARGV[0].match(/(\w+)\/(\w+)/)
+            "#{$1.underscore}_#{$2.singularize.underscore}"
+          else
+            file_name
+          end
+        end
+
+        # support for namespaced-resources
+        def ns_table_name
+          if ARGV[0].match(/(\w+)\/(\w+)/)
+            "#{$1.underscore}/#{$2.tableize}"
+          else
+            table_name
+          end
+        end
+
+        # Returns the name of the mock. For example, if the file name is user,
+        # it returns mock_user.
+        #
+        # If a hash is given, it uses the hash key as the ORM method and the
+        # value as response. So, for ActiveRecord and file name "User":
+        #
+        #   mock_file_name(:save => true)
+        #   #=> mock_user(:save => true)
+        #
+        # If another ORM is being used and another method instead of save is
+        # called, it will be the one used.
+        #
+        def mock_file_name(hash=nil)
+          if hash
+            method, and_return = hash.to_a.first
+            method = orm_instance.send(method).split('.').last.gsub(/\(.*?\)/, '')
+            "mock_#{ns_file_name}(:#{method} => #{and_return})"
+          else
+            "mock_#{ns_file_name}"
+          end
+        end
+
+        # Receives the ORM chain and convert to expects. For ActiveRecord:
+        #
+        #   should! orm_class.find(User, "37")
+        #   #=> User.should_receive(:find).with(37)
+        #
+        # For Datamapper:
+        #
+        #   should! orm_class.find(User, "37")
+        #   #=> User.should_receive(:get).with(37)
+        #
+        def should_receive(chain)
+          stub_or_should_chain(:should_receive, chain)
+        end
+
+        # Receives the ORM chain and convert to stub. For ActiveRecord:
+        #
+        #   stub orm_class.find(User, "37")
+        #   #=> User.stub(:find).with(37)
+        #
+        # For Datamapper:
+        #
+        #   stub orm_class.find(User, "37")
+        #   #=> User.stub(:get).with(37)
+        #
+        def stub(chain)
+          stub_or_should_chain(:stub, chain)
+        end
+
+        def stub_or_should_chain(mode, chain)
+          receiver, method = chain.split(".")
+          method.gsub!(/\((.*?)\)/, '')
+
+          response = "#{receiver}.#{mode}(:#{method})"
+          response << ".with(#{$1})" unless $1.blank?
+          response
+        end
+
+        def value_for(attribute)
+          case attribute.type
+          when :string
+            "#{attribute.name.titleize}".inspect
+          else
+            attribute.default.inspect
+          end
+        end
+
+        def banner
+          self.class.banner
+        end
+
+    end
+  end
+end

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

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'helpers/application_helpers_spec'
 
 # This spec was generated by rspec-rails when you ran the scaffold generator.
 # It demonstrates how one might use RSpec to specify the controller code that
@@ -20,14 +19,13 @@ require 'helpers/application_helpers_spec'
 # that an instance is receiving a specific message.
 
 describe <%= controller_class_name %>Controller do
-  include ApplicationHelpers
 
 <% unless options[:singleton] -%>
   describe "GET index" do
     it "assigns all <%= table_name.pluralize %> as @<%= table_name.pluralize %>" do
-      login_controller_as(:user)
+      <%= "login_controller_as(:user)" if authentication? %>
       <%= file_name %> = Factory(:<%= file_name %>)
-      get :index
+      get :index<%= nested_params_http_request %>
       assigns(:<%= table_name %>).should eq([<%= file_name %>])
     end
   end
@@ -35,26 +33,26 @@ describe <%= controller_class_name %>Controller do
 <% end -%>
   describe "GET show" do
     it "assigns the requested <%= ns_file_name %> as @<%= ns_file_name %>" do
-      login_controller_as(:user)
+      <%= "login_controller_as(:user)" if authentication? %>
       <%= file_name %> = Factory(:<%= file_name %>)
-      get :show, :id => <%= file_name %>.id.to_s
+      get :show, :id => <%= file_name %>.id.to_s<%= nested_params_http_request %>
       assigns(:<%= ns_file_name %>).should eq(<%= file_name %>)
     end
   end
 
   describe "GET new" do
     it "assigns a new <%= ns_file_name %> as @<%= ns_file_name %>" do
-      login_controller_as(:user)
-      get :new
+      <%= "login_controller_as(:user)" if authentication? %>
+      get :new<%= nested_params_http_request_new_parent %>
       assigns(:<%= ns_file_name %>).should be_a_new(<%= class_name %>)
     end
   end
 
   describe "GET edit" do
     it "assigns the requested <%= ns_file_name %> as @<%= ns_file_name %>" do
-      login_controller_as(:user)
+      <%= "login_controller_as(:user)" if authentication? %>
       <%= file_name %> = Factory(:<%= file_name %>)
-      get :edit, :id => <%= file_name %>.id.to_s
+      get :edit, :id => <%= file_name %>.id.to_s<%= nested_params_http_request %>
       assigns(:<%= ns_file_name %>).should eq(<%= file_name %>)
     end
   end
@@ -62,40 +60,40 @@ describe <%= controller_class_name %>Controller do
   describe "POST create" do
     describe "with valid params" do
       it "creates a new <%= class_name %>" do
-        login_controller_as(:user)
+        <%= "login_controller_as(:user)" if authentication? %>
         expect {
-          post :create, :<%= ns_file_name %> => Factory.attributes_for(:<%= file_name %>)
+          post :create, :<%= ns_file_name %> => Factory.attributes_for(:<%= file_name %>)<%= nested_params_http_request_new_parent %>
         }.to change(<%= class_name %>, :count).by(1)
       end
 
       it "assigns a newly created <%= ns_file_name %> as @<%= ns_file_name %>" do
-        login_controller_as(:user)
-        post :create, :<%= ns_file_name %> => Factory.attributes_for(:<%= file_name %>)
+        <%= "login_controller_as(:user)" if authentication? %>
+        post :create, :<%= ns_file_name %> => Factory.attributes_for(:<%= file_name %>)<%= nested_params_http_request_new_parent %>
         assigns(:<%= ns_file_name %>).should be_a(<%= class_name %>)
         assigns(:<%= ns_file_name %>).should be_persisted
       end
 
       it "redirects to the created <%= ns_file_name %>" do
-        login_controller_as(:user)
-        post :create, :<%= ns_file_name %> => Factory.attributes_for(:<%= file_name %>)
-        response.should redirect_to(<%= class_name %>.last)
+        <%= "login_controller_as(:user)" if authentication? %>
+        post :create, :<%= ns_file_name %> => Factory.attributes_for(:<%= file_name %>)<%= nested_params_http_request_new_parent %>
+        response.should redirect_to(<%= show_resource_path_test "#{class_name}.last" %>)
       end
     end
 
     describe "with invalid params" do
       it "assigns a newly created but unsaved <%= ns_file_name %> as @<%= ns_file_name %>" do
-        login_controller_as(:user)
+        <%= "login_controller_as(:user)" if authentication? %>
         # Trigger the behavior that occurs when invalid params are submitted
         <%= class_name %>.any_instance.stub(:save).and_return(false)
-        post :create, :<%= ns_file_name %> => {}
+        post :create, :<%= ns_file_name %> => {}<%= nested_params_http_request_new_parent %>
         assigns(:<%= ns_file_name %>).should be_a_new(<%= class_name %>)
       end
 
       it "re-renders the 'new' template" do
-        login_controller_as(:user)
+        <%= "login_controller_as(:user)" if authentication? %>
         # Trigger the behavior that occurs when invalid params are submitted
         <%= class_name %>.any_instance.stub(:save).and_return(false)
-        post :create, :<%= ns_file_name %> => {}
+        post :create, :<%= ns_file_name %> => {}<%= nested_params_http_request_new_parent %>
         response.should render_template("new")
       end
     end
@@ -104,47 +102,47 @@ describe <%= controller_class_name %>Controller do
   describe "PUT update" do
     describe "with valid params" do
       it "updates the requested <%= ns_file_name %>" do
-        login_controller_as(:user)
+        <%= "login_controller_as(:user)" if authentication? %>
         <%= file_name %> = Factory(:<%= file_name %>)
         # Assuming there are no other <%= table_name %> in the database, this
         # specifies that the <%= class_name %> created on the previous line
         # receives the :update_attributes message with whatever params are
         # submitted in the request.
         <%= class_name %>.any_instance.should_receive(:update_attributes).with(<%= params %>)
-        put :update, :id => <%= file_name %>.id, :<%= ns_file_name %> => <%= params %>
+        put :update, :id => <%= file_name %>.id, :<%= ns_file_name %> => <%= params %><%= nested_params_http_request %>
       end
 
       it "assigns the requested <%= ns_file_name %> as @<%= ns_file_name %>" do
-        login_controller_as(:user)
+        <%= "login_controller_as(:user)" if authentication? %>
         <%= file_name %> = Factory(:<%= file_name %>)
-        put :update, :id => <%= file_name %>.id, :<%= ns_file_name %> => Factory.attributes_for(:<%= file_name %>)
+        put :update, :id => <%= file_name %>.id, :<%= ns_file_name %> => Factory.attributes_for(:<%= file_name %>)<%= nested_params_http_request %>
         assigns(:<%= ns_file_name %>).should eq(<%= file_name %>)
       end
 
       it "redirects to the <%= ns_file_name %>" do
-        login_controller_as(:user)
+        <%= "login_controller_as(:user)" if authentication? %>
         <%= file_name %> = Factory(:<%= file_name %>)
-        put :update, :id => <%= file_name %>.id, :<%= ns_file_name %> => Factory.attributes_for(:<%= file_name %>)
-        response.should redirect_to(<%= file_name %>)
+        put :update, :id => <%= file_name %>.id, :<%= ns_file_name %> => Factory.attributes_for(:<%= file_name %>)<%= nested_params_http_request %>
+        response.should redirect_to(<%= show_resource_path_test %>)
       end
     end
 
     describe "with invalid params" do
       it "assigns the <%= ns_file_name %> as @<%= ns_file_name %>" do
-        login_controller_as(:user)
+        <%= "login_controller_as(:user)" if authentication? %>
         <%= file_name %> = Factory(:<%= file_name %>)
         # Trigger the behavior that occurs when invalid params are submitted
         <%= class_name %>.any_instance.stub(:save).and_return(false)
-        put :update, :id => <%= file_name %>.id.to_s, :<%= ns_file_name %> => {}
+        put :update, :id => <%= file_name %>.id.to_s, :<%= ns_file_name %> => {}<%= nested_params_http_request %>
         assigns(:<%= ns_file_name %>).should eq(<%= file_name %>)
       end
 
       it "re-renders the 'edit' template" do
-        login_controller_as(:user)
+        <%= "login_controller_as(:user)" if authentication? %>
         <%= file_name %> = Factory(:<%= file_name %>)
         # Trigger the behavior that occurs when invalid params are submitted
         <%= class_name %>.any_instance.stub(:save).and_return(false)
-        put :update, :id => <%= file_name %>.id.to_s, :<%= ns_file_name %> => {}
+        put :update, :id => <%= file_name %>.id.to_s, :<%= ns_file_name %> => {}<%= nested_params_http_request %>
         response.should render_template("edit")
       end
     end
@@ -153,29 +151,31 @@ describe <%= controller_class_name %>Controller do
   describe "DELETE destroy" do
     describe "with authorization" do
       it "destroys the requested <%= ns_file_name %>" do
-        login_controller_as(:user_manager)
+        <%= "login_controller_as(:user_manager)" if authentication? %>
         <%= file_name %> = Factory(:<%= file_name %>)
         expect {
-          delete :destroy, :id => <%= file_name %>.id.to_s
+          delete :destroy, :id => <%= file_name %>.id.to_s<%= nested_params_http_request %>
         }.to change(<%= class_name %>, :count).by(-1)
       end
 
       it "redirects to the <%= table_name %> list" do
-        login_controller_as(:user_manager)
+        <%= "login_controller_as(:user_manager)" if authentication? %>
         <%= file_name %> = Factory(:<%= file_name %>)
-        delete :destroy, :id => <%= file_name %>.id.to_s
-        response.should redirect_to(<%= index_helper %>_url)
+        delete :destroy, :id => <%= file_name %>.id.to_s<%= nested_params_http_request %>
+        response.should redirect_to(<%= list_resources_path_test %>)
       end
     end
+    <%- if authorization? -%>
     describe "without authorization" do
       it "destroys the requested <%= ns_file_name %>" do
-        login_controller_as(:user)
+        <%= "login_controller_as(:user)" if authentication? %>
         <%= file_name %> = Factory(:<%= file_name %>)
         expect {
-          delete :destroy, :id => <%= file_name %>.id.to_s
+          delete :destroy, :id => <%= file_name %>.id.to_s<%= nested_params_http_request %>
         }.to change(<%= class_name %>, :count).by(0)
       end
     end
+    <%- end -%>
   end
 
 end

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

@@ -4,12 +4,15 @@ require 'spec_helper'
 describe "<%= ns_table_name %>/edit.html.<%= options[:template_engine] %>" do
   before(:each) do
     @<%= ns_file_name %> = assign(:<%= ns_file_name %>, Factory(:<%= ns_file_name %>) )
+    <%- base_parent_resources.each do |parent| -%>
+    @<%= parent %> = assign(:<%= parent %>, @<%= ns_file_name %>.<%= parent %> )
+    <%- end -%>
   end
 
   it "renders the edit <%= ns_file_name %> form" do
     render
 
-    rendered.should have_selector("form", :action => <%= index_helper %>_path(@<%= ns_file_name %>), :method => "post") do |form|
+    rendered.should have_selector("form", :action => <%= underscore_resource_path :parent_singular_resource_plural %>_path(<%= formatted_resource_path "@", "@" %>), :method => "post") do |form|
     <% for attribute in output_attributes -%>
   form.should have_selector("<%= attribute.input_type -%>#<%= ns_file_name %>_<%= attribute.name %>", :name => "<%= ns_file_name %>[<%= attribute.name %>]")
     <% end -%>

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

@@ -17,8 +17,7 @@ def value_for_check(attribute)
     nil
   else
     "#{name} => r.#{attribute.name}"
-  end <<
-  ":count => 1"
+  end
   ).compact.join(', ')
 end
 %>
@@ -26,8 +25,20 @@ end
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
 describe "<%= ns_table_name %>/index.html.<%= options[:template_engine] %>" do
   before(:each) do
-    @records = assign(:<%= table_name %>, FactoryGirl.create_list(:<%= ns_file_name %>, 2) )
-    assign(:<%= ns_file_name %>, Factory(:<%= ns_file_name %>) )
+    <%- parents = []; str_parents_create = str_parents_where = "" -%>
+    <%- base_parent_resources.each do |parent| -%>
+    @<%= parent %> = assign(:<%= parent %>, Factory(:<%= parent %>) )
+    <%- parents << ":#{parent}_id => @#{parent}.id" -%>
+    <%- end -%>
+    <%- str_parents_create = ", #{parents.join(', ')}" if parents.any? -%>
+    <%- str_parents_where = ".where(#{parents.join(', ')})" if parents.any? -%>
+    <%- if pagination? -%>
+    FactoryGirl.create_list(:<%= ns_file_name %>, 2<%= str_parents_create %>)
+    @records = assign(:<%= table_name %>, <%= class_name %><%= str_parents_where %>.order(:id).page(1) )
+    <%- else -%>
+    @records = assign(:<%= table_name %>, FactoryGirl.create_list(:<%= ns_file_name %>, 2<%= str_parents_create %>) )
+    <%- end -%>
+    assign(:<%= ns_file_name %>, Factory.build(:<%= ns_file_name %>) )
   end
 
   it "renders a list of <%= ns_table_name %>" do

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

@@ -3,14 +3,17 @@ require 'spec_helper'
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
 describe "<%= ns_table_name %>/new.html.<%= options[:template_engine] %>" do
   before(:each) do
-    assign(:<%= ns_file_name %>, Factory.build(:<%= ns_file_name %>) )
+    <%= "#{ns_file_name} = " if nested? %>assign(:<%= ns_file_name %>, Factory.build(:<%= ns_file_name %>) )
+    <%- base_parent_resources.each do |parent| -%>
+    @<%= parent %> = assign(:<%= parent %>, <%= ns_file_name %>.<%= parent %>)
+    <%- end -%>
   end
 
 
   it "renders new <%= ns_file_name %> form" do
     render
 
-    rendered.should have_selector("form", :action => <%= index_helper %>_path, :method => "post") do |form|
+    rendered.should have_selector("form", :action => <%= list_resources_path_test nil, "@" %>, :method => "post") do |form|
     <% for attribute in output_attributes -%>
   form.should have_selector("<%= attribute.input_type -%>#<%= ns_file_name %>_<%= attribute.name %>", :name => "<%= ns_file_name %>[<%= attribute.name %>]")
     <% end -%>