rspec-rails 2.5.0 → 2.6.0

data/features/view_specs/view_spec.feature

@@ -16,12 +16,12 @@ Feature: view spec
 
           render
 
-          rendered.should contain("slicer")
-          rendered.should contain("dicer")
+          rendered.should =~ /slicer/
+          rendered.should =~ /dicer/
         end
       end
       """
-    When I run "rspec spec/views"
+    When I run `rspec spec/views`
     Then the examples should all pass
 
   Scenario: passing spec with before and nesting
@@ -42,13 +42,13 @@ Feature: view spec
           it "displays both widgets" do
             render
 
-            rendered.should contain("slicer")
-            rendered.should contain("dicer")
+            rendered.should =~ /slicer/
+            rendered.should =~ /dicer/
           end
         end
       end
       """
-    When I run "rspec spec/views"
+    When I run `rspec spec/views`
     Then the examples should all pass
 
   Scenario: passing spec with explicit template rendering
@@ -62,7 +62,7 @@ Feature: view spec
 
           render :template => "widgets/widget.html.erb"
 
-          rendered.should contain("slicer")
+          rendered.should =~ /slicer/
         end
       end
       """
@@ -70,7 +70,7 @@ Feature: view spec
       """
       <h2><%= @widget.name %></h2>
       """
-    When I run "rspec spec/views"
+    When I run `rspec spec/views`
     Then the examples should all pass
 
   Scenario: passing spec with rendering of locals in a partial
@@ -84,7 +84,7 @@ Feature: view spec
 
           render :partial => "widgets/widget.html.erb", :locals => {:widget => widget}
 
-          rendered.should contain("slicer")
+          rendered.should =~ /slicer/
         end
       end
       """
@@ -92,7 +92,7 @@ Feature: view spec
       """
       <h3><%= widget.name %></h3>
       """
-    When I run "rspec spec/views"
+    When I run `rspec spec/views`
     Then the examples should all pass
 
   Scenario: passing spec with rendering of locals in an implicit partial
@@ -106,7 +106,7 @@ Feature: view spec
 
           render "widgets/widget", :widget => widget
 
-          rendered.should contain("slicer")
+          rendered.should =~ /slicer/
         end
       end
       """
@@ -114,7 +114,7 @@ Feature: view spec
       """
       <h3><%= widget.name %></h3>
       """
-    When I run "rspec spec/views"
+    When I run `rspec spec/views`
     Then the examples should all pass
 
   Scenario: passing spec with rendering of text
@@ -127,30 +127,11 @@ Feature: view spec
 
           render :text => "This is directly rendered"
 
-          rendered.should contain("directly rendered")
+          rendered.should =~ /directly rendered/
         end
       end
       """
-    When I run "rspec spec/views"
-    Then the examples should all pass
-
-  Scenario: passing spec with rendering of Prototype helper update
-    Given a file named "spec/views/widgets/prototype_update.html.erb_spec.rb" with:
-      """
-      require "spec_helper"
-
-      describe "render a Prototype helper update" do
-        it "hides the status indicator" do
-
-          render :update do |page|
-            page.hide 'status-indicator'
-          end
-
-          rendered.should contain("Element.hide(\"status-indicator\")")
-        end
-      end
-      """
-    When I run "rspec spec/views"
+    When I run `rspec spec/views`
     Then the examples should all pass
 
   Scenario: spec with view that accesses helper_method helpers
@@ -177,9 +158,9 @@ Feature: view spec
 
         it 'checks for admin access' do
           render
-          rendered.should contain('Secret admin area')
+          rendered.should =~ /Secret admin area/
         end
       end
       """
-    When I run "rspec spec/views/secrets"
+    When I run `rspec spec/views/secrets`
     Then the examples should all pass

data/gemfiles/.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_BIN: bin

data/gemfiles/base.rb

@@ -0,0 +1,58 @@
+module GemfileBase
+  def self.extended(host)
+    host.instance_eval do
+      source "http://rubygems.org"
+
+      %w[rspec rspec-core rspec-expectations rspec-mocks rspec-rails].each do |lib|
+        library_path = File.expand_path("../../../#{lib}", __FILE__)
+        if File.exist?(library_path)
+          gem lib, :path => library_path
+        elsif ENV["CI"] || ENV["USE_GIT_REPOS"]
+          gem lib, :git => "git://github.com/rspec/#{lib}.git"
+        else
+          gem lib
+        end
+      end
+
+      gem 'sqlite3-ruby', :require => 'sqlite3'
+      gem "cucumber", "~> 0.10.2"
+      gem "aruba", "~> 0.3.6"
+      gem "growl", "1.0.3"
+      gem "ZenTest", "~> 4.4.2"
+
+      # gem "webrat", "0.7.3"
+      # gem "capybara", "~> 0.4"
+      # gem "capybara", "1.0.0.beta1"
+
+      unless ENV['CI']
+        gem "rcov", "0.9.9"
+        gem "relish", "0.2.0"
+        gem "guard-rspec", "0.1.9"
+
+        if RUBY_PLATFORM =~ /darwin/
+          gem "autotest-fsevent", "~> 0.2.4"
+          gem "autotest-growl", "~> 0.2.9"
+        end
+
+        platforms :mri_18 do
+          gem 'ruby-debug'
+        end
+
+        platforms :mri_19 do
+          gem 'linecache19', '0.5.11' # 0.5.12 cannot install on 1.9.1, and 0.5.11 appears to work with both 1.9.1 & 1.9.2
+          gem 'ruby-debug19'
+          gem 'ruby-debug-base19', RUBY_VERSION == '1.9.1' ? '0.11.23' : '~> 0.11.24'
+        end
+
+        platforms :ruby_18, :ruby_19 do
+          gem "rb-fsevent", "~> 0.3.9"
+          gem "ruby-prof", "~> 0.9.2"
+        end
+      end
+
+      platforms :jruby do
+        gem "jruby-openssl"
+      end
+    end
+  end
+end

data/gemfiles/rails-3-0-stable

@@ -0,0 +1,6 @@
+require File.expand_path("../base.rb", __FILE__)
+
+extend GemfileBase
+
+gem "rails", :git => "git://github.com/rails/rails.git", :branch => "3-0-stable"
+gem "arel",  :git => "git://github.com/rails/arel.git", :branch => "2-0-stable"

data/gemfiles/rails-3.0.0

@@ -0,0 +1,5 @@
+require File.expand_path("../base.rb", __FILE__)
+
+extend GemfileBase
+
+gem "rails", "3.0.0"

data/gemfiles/rails-3.0.1

@@ -0,0 +1,5 @@
+require File.expand_path("../base.rb", __FILE__)
+
+extend GemfileBase
+
+gem "rails", "3.0.1"

data/gemfiles/rails-3.0.2

@@ -0,0 +1,5 @@
+require File.expand_path("../base.rb", __FILE__)
+
+extend GemfileBase
+
+gem "rails", "3.0.2"

data/gemfiles/rails-3.0.3

@@ -0,0 +1,5 @@
+require File.expand_path("../base.rb", __FILE__)
+
+extend GemfileBase
+
+gem "rails", "3.0.3"

data/gemfiles/rails-3.0.4

@@ -0,0 +1,5 @@
+require File.expand_path("../base.rb", __FILE__)
+
+extend GemfileBase
+
+gem "rails", "3.0.4"

data/gemfiles/rails-3.0.5

@@ -0,0 +1,5 @@
+require File.expand_path("../base.rb", __FILE__)
+
+extend GemfileBase
+
+gem "rails", "3.0.5"

data/gemfiles/rails-3.0.6

@@ -0,0 +1,5 @@
+require File.expand_path("../base.rb", __FILE__)
+
+extend GemfileBase
+
+gem "rails", "3.0.6"

data/gemfiles/rails-3.0.7

@@ -0,0 +1,5 @@
+require File.expand_path("../base.rb", __FILE__)
+
+extend GemfileBase
+
+gem "rails", "3.0.7"

data/gemfiles/rails-3.1.0.beta1

@@ -0,0 +1,5 @@
+require File.expand_path("../base.rb", __FILE__)
+
+extend GemfileBase
+
+gem "rails", "3.1.0.beta1"

data/gemfiles/rails-master

@@ -0,0 +1,7 @@
+require File.expand_path("../base.rb", __FILE__)
+
+extend GemfileBase
+
+gem "rails", :git => "git://github.com/rails/rails.git"
+gem "arel",  :git => "git://github.com/rails/arel.git"
+gem "rack",  :git => "git://github.com/rack/rack.git"

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

@@ -65,6 +65,24 @@ module Rspec
           "{'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.
         #
@@ -81,9 +99,9 @@ module Rspec
           if hash
             method, and_return = hash.to_a.first
             method = orm_instance.send(method).split('.').last.gsub(/\(.*?\)/, '')
-            "mock_#{file_name}(:#{method} => #{and_return})"
+            "mock_#{ns_file_name}(:#{method} => #{and_return})"
           else
-            "mock_#{file_name}"
+            "mock_#{ns_file_name}"
           end
         end
 

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

@@ -2,73 +2,96 @@ require 'spec_helper'
 
 # 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
-# was generated by the Rails when you ran the scaffold generator.
+# 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.
+#
+# Compared to earlier versions of this generator, there is very limited use of
+# stubs and message expectations in this spec.  Stubs are only used when there
+# is no simpler way to get a handle on the object needed for the example.
+# Message expectations are only used when there is no simpler way to specify
+# that an instance is receiving a specific message.
 
 describe <%= controller_class_name %>Controller do
 
-  def <%= mock_file_name %>(stubs={})
-    @<%= mock_file_name %> ||= mock_model(<%= class_name %>, stubs).as_null_object
+  # 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
+  # update the return value of this method accordingly.
+  def valid_attributes
+    {}
   end
 
 <% unless options[:singleton] -%>
   describe "GET index" do
     it "assigns all <%= table_name.pluralize %> as @<%= table_name.pluralize %>" do
-      <%= stub orm_class.all(class_name) %> { [<%= mock_file_name %>] }
+      <%= file_name %> = <%= class_name %>.create! valid_attributes
       get :index
-      assigns(:<%= table_name %>).should eq([<%= mock_file_name %>])
+      assigns(:<%= table_name %>).should eq([<%= file_name %>])
     end
   end
 
 <% end -%>
   describe "GET show" do
-    it "assigns the requested <%= file_name %> as @<%= file_name %>" do
-      <%= stub orm_class.find(class_name, "37".inspect) %> { <%= mock_file_name %> }
-      get :show, :id => "37"
-      assigns(:<%= file_name %>).should be(<%= mock_file_name %>)
+    it "assigns the requested <%= ns_file_name %> as @<%= ns_file_name %>" do
+      <%= file_name %> = <%= class_name %>.create! valid_attributes
+      get :show, :id => <%= file_name %>.id.to_s
+      assigns(:<%= ns_file_name %>).should eq(<%= file_name %>)
     end
   end
 
   describe "GET new" do
-    it "assigns a new <%= file_name %> as @<%= file_name %>" do
-      <%= stub orm_class.build(class_name) %> { <%= mock_file_name %> }
+    it "assigns a new <%= ns_file_name %> as @<%= ns_file_name %>" do
       get :new
-      assigns(:<%= file_name %>).should be(<%= mock_file_name %>)
+      assigns(:<%= ns_file_name %>).should be_a_new(<%= class_name %>)
     end
   end
 
   describe "GET edit" do
-    it "assigns the requested <%= file_name %> as @<%= file_name %>" do
-      <%= stub orm_class.find(class_name, "37".inspect) %> { <%= mock_file_name %> }
-      get :edit, :id => "37"
-      assigns(:<%= file_name %>).should be(<%= mock_file_name %>)
+    it "assigns the requested <%= ns_file_name %> as @<%= ns_file_name %>" do
+      <%= file_name %> = <%= class_name %>.create! valid_attributes
+      get :edit, :id => <%= file_name %>.id.to_s
+      assigns(:<%= ns_file_name %>).should eq(<%= file_name %>)
     end
   end
 
   describe "POST create" do
     describe "with valid params" do
-      it "assigns a newly created <%= file_name %> as @<%= file_name %>" do
-        <%= stub orm_class.build(class_name, params) %> { <%= mock_file_name(:save => true) %> }
-        post :create, :<%= file_name %> => <%= params %>
-        assigns(:<%= file_name %>).should be(<%= mock_file_name %>)
+      it "creates a new <%= class_name %>" do
+        expect {
+          post :create, :<%= ns_file_name %> => valid_attributes
+        }.to change(<%= class_name %>, :count).by(1)
       end
 
-      it "redirects to the created <%= file_name %>" do
-        <%= stub orm_class.build(class_name) %> { <%= mock_file_name(:save => true) %> }
-        post :create, :<%= file_name %> => {}
-        response.should redirect_to(<%= table_name.singularize %>_url(<%= mock_file_name %>))
+      it "assigns a newly created <%= ns_file_name %> as @<%= ns_file_name %>" do
+        post :create, :<%= ns_file_name %> => valid_attributes
+        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
+        post :create, :<%= ns_file_name %> => valid_attributes
+        response.should redirect_to(<%= class_name %>.last)
       end
     end
 
     describe "with invalid params" do
-      it "assigns a newly created but unsaved <%= file_name %> as @<%= file_name %>" do
-        <%= stub orm_class.build(class_name, params) %> { <%= mock_file_name(:save => false) %> }
-        post :create, :<%= file_name %> => <%= params %>
-        assigns(:<%= file_name %>).should be(<%= mock_file_name %>)
+      it "assigns a newly created but unsaved <%= ns_file_name %> as @<%= ns_file_name %>" do
+        # Trigger the behavior that occurs when invalid params are submitted
+        <%= class_name %>.any_instance.stub(:save).and_return(false)
+        post :create, :<%= ns_file_name %> => {}
+        assigns(:<%= ns_file_name %>).should be_a_new(<%= class_name %>)
       end
 
       it "re-renders the 'new' template" do
-        <%= stub orm_class.build(class_name) %> { <%= mock_file_name(:save => false) %> }
-        post :create, :<%= file_name %> => {}
+        # Trigger the behavior that occurs when invalid params are submitted
+        <%= class_name %>.any_instance.stub(:save).and_return(false)
+        post :create, :<%= ns_file_name %> => {}
         response.should render_template("new")
       end
     end
@@ -76,50 +99,59 @@ describe <%= controller_class_name %>Controller do
 
   describe "PUT update" do
     describe "with valid params" do
-      it "updates the requested <%= file_name %>" do
-        <%= stub orm_class.find(class_name, "37".inspect) %> { <%= mock_file_name %> }
-        mock_<%= should_receive orm_instance.update_attributes(params) %>
-        put :update, :id => "37", :<%= file_name %> => <%= params %>
+      it "updates the requested <%= ns_file_name %>" do
+        <%= file_name %> = <%= class_name %>.create! valid_attributes
+        # 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 %>
       end
 
-      it "assigns the requested <%= file_name %> as @<%= file_name %>" do
-        <%= stub orm_class.find(class_name) %> { <%= mock_file_name(:update_attributes => true) %> }
-        put :update, :id => "1"
-        assigns(:<%= file_name %>).should be(<%= mock_file_name %>)
+      it "assigns the requested <%= ns_file_name %> as @<%= ns_file_name %>" do
+        <%= file_name %> = <%= class_name %>.create! valid_attributes
+        put :update, :id => <%= file_name %>.id, :<%= ns_file_name %> => valid_attributes
+        assigns(:<%= ns_file_name %>).should eq(<%= file_name %>)
       end
 
-      it "redirects to the <%= file_name %>" do
-        <%= stub orm_class.find(class_name) %> { <%= mock_file_name(:update_attributes => true) %> }
-        put :update, :id => "1"
-        response.should redirect_to(<%= table_name.singularize %>_url(<%= mock_file_name %>))
+      it "redirects to the <%= ns_file_name %>" do
+        <%= file_name %> = <%= class_name %>.create! valid_attributes
+        put :update, :id => <%= file_name %>.id, :<%= ns_file_name %> => valid_attributes
+        response.should redirect_to(<%= file_name %>)
       end
     end
 
     describe "with invalid params" do
-      it "assigns the <%= file_name %> as @<%= file_name %>" do
-        <%= stub orm_class.find(class_name) %> { <%= mock_file_name(:update_attributes => false) %> }
-        put :update, :id => "1"
-        assigns(:<%= file_name %>).should be(<%= mock_file_name %>)
+      it "assigns the <%= ns_file_name %> as @<%= ns_file_name %>" do
+        <%= file_name %> = <%= class_name %>.create! valid_attributes
+        # 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 %> => {}
+        assigns(:<%= ns_file_name %>).should eq(<%= file_name %>)
       end
 
       it "re-renders the 'edit' template" do
-        <%= stub orm_class.find(class_name) %> { <%= mock_file_name(:update_attributes => false) %> }
-        put :update, :id => "1"
+        <%= file_name %> = <%= class_name %>.create! valid_attributes
+        # 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 %> => {}
         response.should render_template("edit")
       end
     end
   end
 
   describe "DELETE destroy" do
-    it "destroys the requested <%= file_name %>" do
-      <%= stub orm_class.find(class_name, "37".inspect) %> { <%= mock_file_name %> }
-      mock_<%= should_receive orm_instance.destroy %>
-      delete :destroy, :id => "37"
+    it "destroys the requested <%= ns_file_name %>" do
+      <%= file_name %> = <%= class_name %>.create! valid_attributes
+      expect {
+        delete :destroy, :id => <%= file_name %>.id.to_s
+      }.to change(<%= class_name %>, :count).by(-1)
     end
 
     it "redirects to the <%= table_name %> list" do
-      <%= stub orm_class.find(class_name) %> { <%= mock_file_name %> }
-      delete :destroy, :id => "1"
+      <%= file_name %> = <%= class_name %>.create! valid_attributes
+      delete :destroy, :id => <%= file_name %>.id.to_s
       response.should redirect_to(<%= index_helper %>_url)
     end
   end

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

@@ -1,29 +1,29 @@
 require 'spec_helper'
 
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
-describe "<%= table_name %>/edit.html.<%= options[:template_engine] %>" do
+describe "<%= ns_table_name %>/edit.html.<%= options[:template_engine] %>" do
   before(:each) do
-    @<%= file_name %> = assign(:<%= file_name %>, stub_model(<%= class_name %><%= output_attributes.empty? ? '))' : ',' %>
+    @<%= ns_file_name %> = assign(:<%= ns_file_name %>, stub_model(<%= class_name %><%= output_attributes.empty? ? '))' : ',' %>
 <% output_attributes.each_with_index do |attribute, attribute_index| -%>
       :<%= attribute.name %> => <%= attribute.default.inspect %><%= attribute_index == output_attributes.length - 1 ? '' : ','%>
 <% end -%>
 <%= output_attributes.empty? ? "" : "    ))\n" -%>
   end
 
-  it "renders the edit <%= file_name %> form" do
+  it "renders the edit <%= ns_file_name %> form" do
     render
 
 <% if webrat? -%>
-    rendered.should have_selector("form", :action => <%= file_name %>_path(@<%= file_name %>), :method => "post") do |form|
+    rendered.should have_selector("form", :action => <%= ns_file_name %>_path(@<%= ns_file_name %>), :method => "post") do |form|
 <% for attribute in output_attributes -%>
-      form.should have_selector("<%= attribute.input_type -%>#<%= file_name %>_<%= attribute.name %>", :name => "<%= file_name %>[<%= attribute.name %>]")
+      form.should have_selector("<%= attribute.input_type -%>#<%= ns_file_name %>_<%= attribute.name %>", :name => "<%= ns_file_name %>[<%= attribute.name %>]")
 <% end -%>
     end
 <% else -%>
     # Run the generator again with the --webrat flag if you want to use webrat matchers
-    assert_select "form", :action => <%= index_helper %>_path(@<%= file_name %>), :method => "post" do
+    assert_select "form", :action => <%= index_helper %>_path(@<%= ns_file_name %>), :method => "post" do
 <% for attribute in output_attributes -%>
-      assert_select "<%= attribute.input_type -%>#<%= file_name %>_<%= attribute.name %>", :name => "<%= file_name %>[<%= attribute.name %>]"
+      assert_select "<%= attribute.input_type -%>#<%= ns_file_name %>_<%= attribute.name %>", :name => "<%= ns_file_name %>[<%= attribute.name %>]"
 <% end -%>
     end
 <% end -%>

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

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
-describe "<%= table_name %>/index.html.<%= options[:template_engine] %>" do
+describe "<%= ns_table_name %>/index.html.<%= options[:template_engine] %>" do
   before(:each) do
     assign(:<%= table_name %>, [
 <% [1,2].each_with_index do |id, model_index| -%>
@@ -16,7 +16,7 @@ describe "<%= table_name %>/index.html.<%= options[:template_engine] %>" do
     ])
   end
 
-  it "renders a list of <%= table_name %>" do
+  it "renders a list of <%= ns_table_name %>" do
     render
 <% for attribute in output_attributes -%>
 <% if webrat? -%>

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

@@ -1,28 +1,28 @@
 require 'spec_helper'
 
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
-describe "<%= table_name %>/new.html.<%= options[:template_engine] %>" do
+describe "<%= ns_table_name %>/new.html.<%= options[:template_engine] %>" do
   before(:each) do
-    assign(:<%= file_name %>, stub_model(<%= class_name %><%= output_attributes.empty? ? ').as_new_record)' : ',' %>
+    assign(:<%= ns_file_name %>, stub_model(<%= class_name %><%= output_attributes.empty? ? ').as_new_record)' : ',' %>
 <% output_attributes.each_with_index do |attribute, attribute_index| -%>
       :<%= attribute.name %> => <%= attribute.default.inspect %><%= attribute_index == output_attributes.length - 1 ? '' : ','%>
 <% end -%>
 <%= !output_attributes.empty? ? "    ).as_new_record)\n  end" : "  end" %>
 
-  it "renders new <%= file_name %> form" do
+  it "renders new <%= ns_file_name %> form" do
     render
 
 <% if webrat? -%>
     rendered.should have_selector("form", :action => <%= table_name %>_path, :method => "post") do |form|
 <% for attribute in output_attributes -%>
-      form.should have_selector("<%= attribute.input_type -%>#<%= file_name %>_<%= attribute.name %>", :name => "<%= file_name %>[<%= attribute.name %>]")
+      form.should have_selector("<%= attribute.input_type -%>#<%= ns_file_name %>_<%= attribute.name %>", :name => "<%= ns_file_name %>[<%= attribute.name %>]")
 <% end -%>
     end
 <% else -%>
     # Run the generator again with the --webrat flag if you want to use webrat matchers
     assert_select "form", :action => <%= index_helper %>_path, :method => "post" do
 <% for attribute in output_attributes -%>
-      assert_select "<%= attribute.input_type -%>#<%= file_name %>_<%= attribute.name %>", :name => "<%= file_name %>[<%= attribute.name %>]"
+      assert_select "<%= attribute.input_type -%>#<%= ns_file_name %>_<%= attribute.name %>", :name => "<%= ns_file_name %>[<%= attribute.name %>]"
 <% end -%>
     end
 <% end -%>