typo 5.1.3 → 5.1.98

data/vendor/plugins/{rspec_on_rails → rspec-rails}/generators/rspec_model/rspec_model_generator.rb

@@ -1,4 +1,5 @@
 require 'rails_generator/generators/components/model/model_generator'
+require File.dirname(__FILE__) + '/../rspec_default_values'
 
 class RspecModelGenerator < ModelGenerator
 
@@ -11,12 +12,16 @@ class RspecModelGenerator < ModelGenerator
       # Model, spec, and fixture directories.
       m.directory File.join('app/models', class_path)
       m.directory File.join('spec/models', class_path)
-      m.directory File.join('spec/fixtures', class_path)
+      unless options[:skip_fixture]
+        m.directory File.join('spec/fixtures', class_path)
+      end
 
       # Model class, spec and fixtures.
       m.template 'model:model.rb',      File.join('app/models', class_path, "#{file_name}.rb")
-      m.template 'model:fixtures.yml',  File.join('spec/fixtures', class_path, "#{table_name}.yml")
       m.template 'model_spec.rb',       File.join('spec/models', class_path, "#{file_name}_spec.rb")
+      unless options[:skip_fixture]
+        m.template 'model:fixtures.yml',  File.join('spec/fixtures', "#{table_name}.yml")
+      end
 
       unless options[:skip_migration]
         m.migration_template 'model:migration.rb', 'db/migrate', :assigns => {

data/vendor/plugins/rspec-rails/generators/rspec_model/templates/model_spec.rb

@@ -0,0 +1,15 @@
+require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../spec_helper')
+
+describe <%= class_name %> do
+  before(:each) do
+    @valid_attributes = {
+<% attributes.each_with_index do |attribute, attribute_index| -%>
+      :<%= attribute.name %> => <%= attribute.default_value %><%= attribute_index == attributes.length - 1 ? '' : ','%>
+<% end -%>
+    }
+  end
+
+  it "should create a new instance given valid attributes" do
+    <%= class_name %>.create!(@valid_attributes)
+  end
+end

data/vendor/plugins/{rspec_on_rails → rspec-rails}/generators/rspec_scaffold/rspec_scaffold_generator.rb

@@ -1,3 +1,5 @@
+require File.dirname(__FILE__) + '/../rspec_default_values'
+
 class RspecScaffoldGenerator < Rails::Generator::NamedBase
   default_options :skip_migration => false
   
@@ -140,21 +142,6 @@ end
 module Rails
   module Generator
     class GeneratedAttribute
-      def default_value
-        @default_value ||= case type
-          when :int, :integer               then "\"1\""
-          when :float                       then "\"1.5\""
-          when :decimal                     then "\"9.99\""
-          when :datetime, :timestamp, :time then "Time.now"
-          when :date                        then "Date.today"
-          when :string                      then "\"MyString\""
-          when :text                        then "\"MyText\""
-          when :boolean                     then "false"
-          else
-            ""
-        end      
-      end
-
       def input_type
         @input_type ||= case type
           when :text                        then "textarea"

data/vendor/plugins/rspec-rails/generators/rspec_scaffold/templates/controller_spec.rb

@@ -0,0 +1,173 @@
+require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../spec_helper')
+
+describe <%= controller_class_name %>Controller do
+
+  def mock_<%= file_name %>(stubs={})
+    @mock_<%= file_name %> ||= mock_model(<%= class_name %>, stubs)
+  end
+  
+  describe "responding to GET index" do
+
+    it "should expose all <%= table_name.pluralize %> as @<%= table_name.pluralize %>" do
+      <%= class_name %>.should_receive(:find).with(:all).and_return([mock_<%= file_name %>])
+      get :index
+      assigns[:<%= table_name %>].should == [mock_<%= file_name %>]
+    end
+
+    describe "with mime type of xml" do
+  
+      it "should render all <%= table_name.pluralize %> as xml" do
+        request.env["HTTP_ACCEPT"] = "application/xml"
+        <%= class_name %>.should_receive(:find).with(:all).and_return(<%= file_name.pluralize %> = mock("Array of <%= class_name.pluralize %>"))
+        <%= file_name.pluralize %>.should_receive(:to_xml).and_return("generated XML")
+        get :index
+        response.body.should == "generated XML"
+      end
+    
+    end
+
+  end
+
+  describe "responding to GET show" do
+
+    it "should expose the requested <%= file_name %> as @<%= file_name %>" do
+      <%= class_name %>.should_receive(:find).with("37").and_return(mock_<%= file_name %>)
+      get :show, :id => "37"
+      assigns[:<%= file_name %>].should equal(mock_<%= file_name %>)
+    end
+    
+    describe "with mime type of xml" do
+
+      it "should render the requested <%= file_name %> as xml" do
+        request.env["HTTP_ACCEPT"] = "application/xml"
+        <%= class_name %>.should_receive(:find).with("37").and_return(mock_<%= file_name %>)
+        mock_<%= file_name %>.should_receive(:to_xml).and_return("generated XML")
+        get :show, :id => "37"
+        response.body.should == "generated XML"
+      end
+
+    end
+    
+  end
+
+  describe "responding to GET new" do
+  
+    it "should expose a new <%= file_name %> as @<%= file_name %>" do
+      <%= class_name %>.should_receive(:new).and_return(mock_<%= file_name %>)
+      get :new
+      assigns[:<%= file_name %>].should equal(mock_<%= file_name %>)
+    end
+
+  end
+
+  describe "responding to GET edit" do
+  
+    it "should expose the requested <%= file_name %> as @<%= file_name %>" do
+      <%= class_name %>.should_receive(:find).with("37").and_return(mock_<%= file_name %>)
+      get :edit, :id => "37"
+      assigns[:<%= file_name %>].should equal(mock_<%= file_name %>)
+    end
+
+  end
+
+  describe "responding to POST create" do
+
+    describe "with valid params" do
+      
+      it "should expose a newly created <%= file_name %> as @<%= file_name %>" do
+        <%= class_name %>.should_receive(:new).with({'these' => 'params'}).and_return(mock_<%= file_name %>(:save => true))
+        post :create, :<%= file_name %> => {:these => 'params'}
+        assigns(:<%= file_name %>).should equal(mock_<%= file_name %>)
+      end
+
+      it "should redirect to the created <%= file_name %>" do
+        <%= class_name %>.stub!(:new).and_return(mock_<%= file_name %>(:save => true))
+        post :create, :<%= file_name %> => {}
+        response.should redirect_to(<%= table_name.singularize %>_url(mock_<%= file_name %>))
+      end
+      
+    end
+    
+    describe "with invalid params" do
+
+      it "should expose a newly created but unsaved <%= file_name %> as @<%= file_name %>" do
+        <%= class_name %>.stub!(:new).with({'these' => 'params'}).and_return(mock_<%= file_name %>(:save => false))
+        post :create, :<%= file_name %> => {:these => 'params'}
+        assigns(:<%= file_name %>).should equal(mock_<%= file_name %>)
+      end
+
+      it "should re-render the 'new' template" do
+        <%= class_name %>.stub!(:new).and_return(mock_<%= file_name %>(:save => false))
+        post :create, :<%= file_name %> => {}
+        response.should render_template('new')
+      end
+      
+    end
+    
+  end
+
+  describe "responding to PUT udpate" do
+
+    describe "with valid params" do
+
+      it "should update the requested <%= file_name %>" do
+        <%= class_name %>.should_receive(:find).with("37").and_return(mock_<%= file_name %>)
+        mock_<%= file_name %>.should_receive(:update_attributes).with({'these' => 'params'})
+        put :update, :id => "37", :<%= file_name %> => {:these => 'params'}
+      end
+
+      it "should expose the requested <%= file_name %> as @<%= file_name %>" do
+        <%= class_name %>.stub!(:find).and_return(mock_<%= file_name %>(:update_attributes => true))
+        put :update, :id => "1"
+        assigns(:<%= file_name %>).should equal(mock_<%= file_name %>)
+      end
+
+      it "should redirect to the <%= file_name %>" do
+        <%= class_name %>.stub!(:find).and_return(mock_<%= file_name %>(:update_attributes => true))
+        put :update, :id => "1"
+        response.should redirect_to(<%= table_name.singularize %>_url(mock_<%= file_name %>))
+      end
+
+    end
+    
+    describe "with invalid params" do
+
+      it "should update the requested <%= file_name %>" do
+        <%= class_name %>.should_receive(:find).with("37").and_return(mock_<%= file_name %>)
+        mock_<%= file_name %>.should_receive(:update_attributes).with({'these' => 'params'})
+        put :update, :id => "37", :<%= file_name %> => {:these => 'params'}
+      end
+
+      it "should expose the <%= file_name %> as @<%= file_name %>" do
+        <%= class_name %>.stub!(:find).and_return(mock_<%= file_name %>(:update_attributes => false))
+        put :update, :id => "1"
+        assigns(:<%= file_name %>).should equal(mock_<%= file_name %>)
+      end
+
+      it "should re-render the 'edit' template" do
+        <%= class_name %>.stub!(:find).and_return(mock_<%= file_name %>(:update_attributes => false))
+        put :update, :id => "1"
+        response.should render_template('edit')
+      end
+
+    end
+
+  end
+
+  describe "responding to DELETE destroy" do
+
+    it "should destroy the requested <%= file_name %>" do
+      <%= class_name %>.should_receive(:find).with("37").and_return(mock_<%= file_name %>)
+      mock_<%= file_name %>.should_receive(:destroy)
+      delete :destroy, :id => "37"
+    end
+  
+    it "should redirect to the <%= table_name %> list" do
+      <%= class_name %>.stub!(:find).and_return(mock_<%= file_name %>(:destroy => true))
+      delete :destroy, :id => "1"
+      response.should redirect_to(<%= table_name %>_url)
+    end
+
+  end
+
+end

data/vendor/plugins/{rspec_on_rails → rspec-rails}/generators/rspec_scaffold/templates/edit_erb_spec.rb

@@ -1,14 +1,15 @@
-require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper')
 
 describe "/<%= table_name %>/edit.<%= default_file_extension %>" do
   include <%= controller_class_name %>Helper
   
-  before do
-    @<%= file_name %> = mock_model(<%= class_name %>)
-<% for attribute in attributes -%>
-    @<%= file_name %>.stub!(:<%= attribute.name %>).and_return(<%= attribute.default_value %>)
-<% end -%>
-    assigns[:<%= file_name %>] = @<%= file_name %>
+  before(:each) do
+    assigns[:<%= file_name %>] = @<%= file_name %> = stub_model(<%= class_name %>,
+      :new_record? => false<%= attributes.empty? ? '' : ',' %>
+<% attributes.each_with_index do |attribute, attribute_index| -%><% unless attribute.name =~ /_id/ || [:datetime, :timestamp, :time, :date].index(attribute.type) -%>
+      :<%= attribute.name %> => <%= attribute.default_value %><%= attribute_index == attributes.length - 1 ? '' : ','%>
+<% end -%><% end -%>
+    )
   end
 
   it "should render edit form" do

data/vendor/plugins/rspec-rails/generators/rspec_scaffold/templates/helper_spec.rb

@@ -0,0 +1,11 @@
+require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../spec_helper')
+
+describe <%= controller_class_name %>Helper do
+  
+  #Delete this example and add some real ones or delete this file
+  it "should be included in the object returned by #helper" do
+    included_modules = (class << helper; self; end).send :included_modules
+    included_modules.should include(<%= controller_class_name %>Helper)
+  end
+  
+end

data/vendor/plugins/rspec-rails/generators/rspec_scaffold/templates/index_erb_spec.rb

@@ -0,0 +1,27 @@
+require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper')
+
+describe "/<%= table_name %>/index.<%= default_file_extension %>" do
+  include <%= controller_class_name %>Helper
+  
+  before(:each) do
+    assigns[:<%= table_name %>] = [
+<% [1,2].each_with_index do |id, model_index| -%>
+      stub_model(<%= class_name %><%= attributes.empty? ? (model_index == 1 ? ')' : '),') : ',' %>
+<% attributes.each_with_index do |attribute, attribute_index| -%><% unless attribute.name =~ /_id/ || [:datetime, :timestamp, :time, :date].index(attribute.type) -%>
+        :<%= attribute.name %> => <%= attribute.default_value %><%= attribute_index == attributes.length - 1 ? '' : ','%>
+<% end -%><% end -%>
+<% if !attributes.empty? -%>
+      <%= model_index == 1 ? ')' : '),' %>
+<% end -%>
+<% end -%>
+    ]
+  end
+
+  it "should render list of <%= table_name %>" do
+    render "/<%= table_name %>/index.<%= default_file_extension %>"
+<% for attribute in attributes -%><% unless attribute.name =~ /_id/ || [:datetime, :timestamp, :time, :date].index(attribute.type) -%>
+    response.should have_tag("tr>td", <%= attribute.default_value %>, 2)
+<% end -%><% end -%>
+  end
+end
+

data/vendor/plugins/{rspec_on_rails → rspec-rails}/generators/rspec_scaffold/templates/new_erb_spec.rb

@@ -1,15 +1,15 @@
-require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper')
 
 describe "/<%= table_name %>/new.<%= default_file_extension %>" do
   include <%= controller_class_name %>Helper
   
   before(:each) do
-    @<%= file_name %> = mock_model(<%= class_name %>)
-    @<%= file_name %>.stub!(:new_record?).and_return(true)
-<% for attribute in attributes -%>
-    @<%= file_name %>.stub!(:<%= attribute.name %>).and_return(<%= attribute.default_value %>)
-<% end -%>
-    assigns[:<%= file_name %>] = @<%= file_name %>
+    assigns[:<%= file_name %>] = stub_model(<%= class_name %>,
+      :new_record? => true<%= attributes.empty? ? '' : ',' %>
+<% attributes.each_with_index do |attribute, attribute_index| -%><% unless attribute.name =~ /_id/ || [:datetime, :timestamp, :time, :date].index(attribute.type) -%>
+      :<%= attribute.name %> => <%= attribute.default_value %><%= attribute_index == attributes.length - 1 ? '' : ','%>
+<% end -%><% end -%>
+    )
   end
 
   it "should render new form" do

data/vendor/plugins/{rspec_on_rails → rspec-rails}/generators/rspec_scaffold/templates/routing_spec.rb

@@ -1,61 +1,59 @@
-require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../spec_helper')
 
 describe <%= controller_class_name %>Controller do
   describe "route generation" do
-
-    it "should map { :controller => '<%= table_name %>', :action => 'index' } to /<%= table_name %>" do
+    it "should map #index" do
       route_for(:controller => "<%= table_name %>", :action => "index").should == "/<%= table_name %>"
     end
   
-    it "should map { :controller => '<%= table_name %>', :action => 'new' } to /<%= table_name %>/new" do
+    it "should map #new" do
       route_for(:controller => "<%= table_name %>", :action => "new").should == "/<%= table_name %>/new"
     end
   
-    it "should map { :controller => '<%= table_name %>', :action => 'show', :id => 1 } to /<%= table_name %>/1" do
+    it "should map #show" do
       route_for(:controller => "<%= table_name %>", :action => "show", :id => 1).should == "/<%= table_name %>/1"
     end
   
-    it "should map { :controller => '<%= table_name %>', :action => 'edit', :id => 1 } to /<%= table_name %>/1<%= resource_edit_path %>" do
+    it "should map #edit" do
       route_for(:controller => "<%= table_name %>", :action => "edit", :id => 1).should == "/<%= table_name %>/1<%= resource_edit_path %>"
     end
   
-    it "should map { :controller => '<%= table_name %>', :action => 'update', :id => 1} to /<%= table_name %>/1" do
+    it "should map #update" do
       route_for(:controller => "<%= table_name %>", :action => "update", :id => 1).should == "/<%= table_name %>/1"
     end
   
-    it "should map { :controller => '<%= table_name %>', :action => 'destroy', :id => 1} to /<%= table_name %>/1" do
+    it "should map #destroy" do
       route_for(:controller => "<%= table_name %>", :action => "destroy", :id => 1).should == "/<%= table_name %>/1"
     end
   end
 
   describe "route recognition" do
-
-    it "should generate params { :controller => '<%= table_name %>', action => 'index' } from GET /<%= table_name %>" do
+    it "should generate params for #index" do
       params_from(:get, "/<%= table_name %>").should == {:controller => "<%= table_name %>", :action => "index"}
     end
   
-    it "should generate params { :controller => '<%= table_name %>', action => 'new' } from GET /<%= table_name %>/new" do
+    it "should generate params for #new" do
       params_from(:get, "/<%= table_name %>/new").should == {:controller => "<%= table_name %>", :action => "new"}
     end
   
-    it "should generate params { :controller => '<%= table_name %>', action => 'create' } from POST /<%= table_name %>" do
+    it "should generate params for #create" do
       params_from(:post, "/<%= table_name %>").should == {:controller => "<%= table_name %>", :action => "create"}
     end
   
-    it "should generate params { :controller => '<%= table_name %>', action => 'show', id => '1' } from GET /<%= table_name %>/1" do
+    it "should generate params for #show" do
       params_from(:get, "/<%= table_name %>/1").should == {:controller => "<%= table_name %>", :action => "show", :id => "1"}
     end
   
-    it "should generate params { :controller => '<%= table_name %>', action => 'edit', id => '1' } from GET /<%= table_name %>/1;edit" do
+    it "should generate params for #edit" do
       params_from(:get, "/<%= table_name %>/1<%= resource_edit_path %>").should == {:controller => "<%= table_name %>", :action => "edit", :id => "1"}
     end
   
-    it "should generate params { :controller => '<%= table_name %>', action => 'update', id => '1' } from PUT /<%= table_name %>/1" do
+    it "should generate params for #update" do
       params_from(:put, "/<%= table_name %>/1").should == {:controller => "<%= table_name %>", :action => "update", :id => "1"}
     end
   
-    it "should generate params { :controller => '<%= table_name %>', action => 'destroy', id => '1' } from DELETE /<%= table_name %>/1" do
+    it "should generate params for #destroy" do
       params_from(:delete, "/<%= table_name %>/1").should == {:controller => "<%= table_name %>", :action => "destroy", :id => "1"}
     end
   end
-end
+end

data/vendor/plugins/rspec-rails/generators/rspec_scaffold/templates/show_erb_spec.rb

@@ -0,0 +1,23 @@
+require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper')
+
+describe "/<%= table_name %>/show.<%= default_file_extension %>" do
+  include <%= controller_class_name %>Helper
+  
+  before(:each) do
+    assigns[:<%= file_name %>] = @<%= file_name %> = stub_model(<%= class_name %><%= attributes.empty? ? ')' : ',' %>
+<% attributes.each_with_index do |attribute, attribute_index| -%><% unless attribute.name =~ /_id/ || [:datetime, :timestamp, :time, :date].index(attribute.type) -%>
+      :<%= attribute.name %> => <%= attribute.default_value %><%= attribute_index == attributes.length - 1 ? '' : ','%>
+<% end -%><% end -%>
+<% if !attributes.empty? -%>
+    )
+<% end -%>
+  end
+
+  it "should render attributes in <p>" do
+    render "/<%= table_name %>/show.<%= default_file_extension %>"
+<% for attribute in attributes -%><% unless attribute.name =~ /_id/ || [:datetime, :timestamp, :time, :date].index(attribute.type) -%>
+    response.should have_text(/<%= Regexp.escape(attribute.default_value)[1..-2]%>/)
+<% end -%><% end -%>
+  end
+end
+

data/vendor/plugins/{rspec_on_rails → rspec-rails}/lib/autotest/rails_rspec.rb

@@ -26,7 +26,7 @@ require 'active_support'
 require 'autotest/rspec'
 
 Autotest.add_hook :initialize do |at|
-  %w{^config/ ^coverage/ ^db/ ^doc/ ^log/ ^public/ ^script ^vendor/rails ^vendor/plugins previous_failures.txt}.each do |exception|
+  %w{config/ coverage/ db/ doc/ log/ public/ script/ tmp/ vendor/rails vendor/plugins previous_failures.txt}.each do |exception|
     at.add_exception(exception)
   end
   
@@ -73,9 +73,4 @@ Autotest.add_hook :initialize do |at|
 end
 
 class Autotest::RailsRspec < Autotest::Rspec
-
-  def spec_command
-    "script/spec"
-  end
-    
 end

data/vendor/plugins/rspec-rails/lib/spec/rails/example/assigns_hash_proxy.rb

@@ -0,0 +1,40 @@
+module Spec
+  module Rails
+    module Example
+      class AssignsHashProxy #:nodoc:
+        def initialize(example_group, &block)
+          @target = block.call
+          @example_group = example_group
+        end
+
+        def [](key)
+          return false if assigns[key] == false
+          return false if assigns[key.to_s] == false
+          assigns[key] || assigns[key.to_s] || @target.instance_variable_get("@#{key}")
+        end
+
+        def []=(key, val)
+          @target.instance_variable_set("@#{key}", val)
+        end
+
+        def delete(key)
+          assigns.delete(key.to_s)
+          @target.instance_variable_set("@#{key}", nil)
+        end
+
+        def each(&block)
+          assigns.each &block
+        end
+
+        def has_key?(key)
+          assigns.key?(key.to_s)
+        end
+
+        protected
+        def assigns
+          @example_group.orig_assigns
+        end
+      end
+    end
+  end
+end