rspec-rails 2.0.0.a4 → 2.0.0.a5

data/README.markdown

@@ -12,11 +12,13 @@ Currently in super-pre-alpha state - explore at your own risk!
 
 Install:
 
+    gem install rspec-rails --pre
+
+Build from source and install:
+
     git clone git://github.com/rspec/rspec-dev
     cd rspec-dev
-    rake git:clone
-    rake gem:build
-    rake gem:install
+    rake
 
 This installs the following gems:
 
@@ -30,29 +32,19 @@ This installs the following gems:
 
 Currently supported:
 
-* controller specs in spec/controllers
-  * no view isolation yet
+* each example runs in its own transaction
+  * not yet configurable
 * model specs in spec/models
 * request specs in spec/requests
   * these wrap rails integration tests
 * rails assertions
 * webrat matchers
-* rails-specific matchers
-  * response.should redirect_to(...)
-    * wraps assert_redirected_to
-    * only works with should (not should_not)
 * generators
-  * borrowed from José Valim's third_rails repo on github
-  * the generators work, but not all the generated specs
-    work yet :(
 
 ### Known issues
 
-None (or very little) of the following are supported yet (but will be soon):
+* no controller specs
+* no view specs
+* no helper specs
+* no routing specs
 
-* rails-specific matchers
-  * only supports "response.should redirect_to(..)"
-* isolation from views in controller specs
-* view specs
-* helper specs
-* routing specs

data/Rakefile

@@ -17,7 +17,7 @@ begin
     gem.email = "dchelimsky@gmail.com;chad.humphries@gmail.com"
     gem.homepage = "http://github.com/rspec/rspec-rails"
     gem.authors = ["David Chelimsky", "Chad Humphries"]
-    gem.add_dependency "rspec", ">= 2.0.0.a2"
+    gem.add_dependency "rspec", ">= 2.0.0.a5"
     gem.add_dependency "webrat", "0.7.0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/example_app_template.rb

@@ -4,27 +4,15 @@ require 'rspec/rails/version'
 # - would be nicer if we could source them from the <repo>/pkg dirs
 gem 'rspec-rails', :version => "'#{Rspec::Rails::Version::STRING}'"
 
-initializer 'generators.rb', <<-CODE
-module ExampleApp
-  class Application < Rails::Application
-    config.generators do |g|
-      g.test_framework   :rspec,
-                         :fixtures => false,
-                         :routes => false,
-                         :views => false
-    end
-  end
-end
-CODE
-
 run('bundle install')
 
 run('script/rails g rspec:install')
-run('script/rails g model thing name:string')
-run('script/rails g controller widgets index')
-run('script/rails g integration_test widgets')
+# run('script/rails g model thing name:string')
+run('script/rails g scaffold wombats name:string')
+# run('script/rails g controller widgets index')
+# run('script/rails g integration_test widgets')
 
 run('rake db:migrate')
 run('rake db:test:prepare')
-run('bin/rspec spec')
+run('rspec spec')
 run('rake spec')

data/lib/generators/rspec/controller/controller_generator.rb

@@ -6,13 +6,19 @@ module Rspec
       argument :actions, :type => :array, :default => [], :banner => "action action"
 
       class_option :template_engine, :desc => "Template engine to generate view files"
+      class_option :controllers, :type => :boolean, :default => false
+      class_option :views,       :type => :boolean, :default => false
 
       def create_controller_files
+        return unless options[:controllers]
+
         template 'controller_spec.rb',
                  File.join('spec/controllers', class_path, "#{file_name}_controller_spec.rb")
       end
 
       def create_view_files
+        return unless options[:views]
+
         empty_directory File.join("spec", "views", file_path)
 
         actions.each do |action|

data/lib/generators/rspec/helper/helper_generator.rb

@@ -3,7 +3,11 @@ require 'generators/rspec'
 module Rspec
   module Generators
     class HelperGenerator < Base
+      class_option :helpers, :type => :boolean, :default => false
+
       def create_helper_files
+        return unless options[:helpers]
+
         template 'helper_spec.rb', File.join('spec/helpers', class_path, "#{file_name}_helper_spec.rb")
       end
     end

data/lib/generators/rspec/install/install_generator.rb

@@ -1,7 +1,6 @@
 module Rspec
   module Generators
     class InstallGenerator < Rails::Generators::Base
-      add_shebang_option!
 
       desc <<DESC
 Description:
@@ -16,14 +15,20 @@ DESC
         directory 'lib'
       end
 
-      # def copy_script_files
-        # directory "script"
-        # chmod "script/rspec", 0755, :verbose => false
-      # end
+      def create_config_files
+        inside "config" do
+          directory "initializers"
+        end
+      end
 
       def copy_spec_files
         directory 'spec'
       end
+
+      def app_name
+        Rails.application.class.name
+      end
+
     end
   end
 end

data/lib/generators/rspec/install/templates/config/initializers/rspec_generator.rb.tt

@@ -0,0 +1,16 @@
+<%= app_name %>.configure do
+  # We're still in alpha, so we're only generating model specs
+  # and request (integration) specs. We'll change these defaults
+  # as we add support for controller specs, etc.
+  config.generators do |g|
+    g.integration_tool :rspec
+    g.test_framework   :rspec,
+                       :fixture     => false,
+                       :controllers => false,
+                       :views       => false,
+                       :helpers     => false,
+                       :routes      => false,
+                       :integration => true
+
+  end
+end

data/lib/generators/rspec/install/templates/spec/spec.opts

@@ -1,4 +1,2 @@
---colour
+--color
 --format progress
---loadby mtime
---reverse

data/lib/generators/rspec/install/templates/spec/spec_helper.rb

@@ -15,14 +15,24 @@ Rspec::Core.configure do |config|
   require 'rspec/expectations'
   config.include Rspec::Matchers
 
+  # == Mock Framework
+  #
+  # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
+  #
+  # config.mock_with :mocha
+  # config.mock_with :flexmock
+  # config.mock_with :rr
+  config.mock_with :rspec
+
+  # == Fixtures
+  #
   # If you're not using ActiveRecord you should remove these
   # lines, delete config/database.yml and disable :active_record
   # in your config/boot.rb
+  #
   # config.use_transactional_fixtures = true
   # config.use_instantiated_fixtures  = false
   # config.fixture_path = RAILS_ROOT + '/spec/fixtures/'
-
-  # == Fixtures
   #
   # You can declare fixtures for each example_group like this:
   #   describe "...." do
@@ -41,15 +51,6 @@ Rspec::Core.configure do |config|
   #
   # config.fixture_path = RAILS_ROOT + '/spec/fixtures/'
   #
-  # == Mock Framework
-  #
-  # RSpec uses it's own mocking framework by default. If you prefer to
-  # use mocha, flexmock or RR, uncomment the appropriate line:
-  #
-  # config.mock_with :mocha
-  # config.mock_with :flexmock
-  # config.mock_with :rr
-  #
   # == Notes
   #
   # For more information take a look at Rspec::Core::Configuration

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

@@ -1,4 +1,9 @@
 require 'spec_helper'
 
-describe "<%= class_name.pluralize %>" do
+describe <%= class_name.pluralize %> do
+  describe "GET /<%= table_name %>" do
+    it "works! (now write some real specs)" do
+      get "/<%= table_name %>"
+    end
+  end
 end

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

@@ -1,5 +1,5 @@
 require 'generators/rspec'
-require 'generators/resource_helpers'
+require 'rails/generators/resource_helpers'
 
 module Rspec
   module Generators
@@ -11,10 +11,13 @@ module Rspec
       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 :views,  :type => :boolean, :default => true
-      class_option :routes, :type => :boolean, :default => true
+      class_option :controllers, :type => :boolean, :default => false
+      class_option :views,       :type => :boolean, :default => false
+      class_option :routes,      :type => :boolean, :default => false
 
       def copy_controller_files
+        return unless options[:controllers]
+
         template 'controller_spec.rb',
                  File.join('spec/controllers', controller_class_path, "#{controller_file_name}_controller_spec.rb")
       end
@@ -80,7 +83,7 @@ module Rspec
         #   should! orm_class.find(User, "37")
         #   #=> User.should_receive(:get).with(37)
         #
-        def should!(chain)
+        def should_receive!(chain)
           stub_or_should_chain(:should_receive, chain)
         end
 
@@ -95,7 +98,7 @@ module Rspec
         #   #=> User.stub!(:get).with(37)
         #
         def stub!(chain)
-          stub_or_should_chain(:stub!, chain)
+          stub_or_should_chain(:stub, chain)
         end
 
         def stub_or_should_chain(mode, chain)

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

@@ -9,7 +9,7 @@ describe <%= controller_class_name %>Controller do
   <% unless options[:singleton] -%>
   describe "GET index" do
     it "assigns all <%= table_name.pluralize %> as @<%= table_name.pluralize %>" do
-      <%= stub! orm_class.all(class_name) %>.and_return([<%= mock_file_name %>])
+      <%= stub orm_class.all(class_name) %>.and_return([<%= mock_file_name %>])
       get :index
       assigns[:<%= table_name %>].should == [<%= mock_file_name %>]
     end
@@ -18,7 +18,7 @@ describe <%= controller_class_name %>Controller do
 
   describe "GET show" do
     it "assigns the requested <%= file_name %> as @<%= file_name %>" do
-      <%= stub! orm_class.find(class_name, "37".inspect) %>.and_return(<%= mock_file_name %>)
+      <%= stub orm_class.find(class_name, "37".inspect) %>.and_return(<%= mock_file_name %>)
       get :show, :id => "37"
       assigns[:<%= file_name %>].should equal(<%= mock_file_name %>)
     end
@@ -26,7 +26,7 @@ describe <%= controller_class_name %>Controller do
 
   describe "GET new" do
     it "assigns a new <%= file_name %> as @<%= file_name %>" do
-      <%= stub! orm_class.build(class_name) %>.and_return(<%= mock_file_name %>)
+      <%= stub orm_class.build(class_name) %>.and_return(<%= mock_file_name %>)
       get :new
       assigns[:<%= file_name %>].should equal(<%= mock_file_name %>)
     end
@@ -34,7 +34,7 @@ describe <%= controller_class_name %>Controller do
 
   describe "GET edit" do
     it "assigns the requested <%= file_name %> as @<%= file_name %>" do
-      <%= stub! orm_class.find(class_name, "37".inspect) %>.and_return(<%= mock_file_name %>)
+      <%= stub orm_class.find(class_name, "37".inspect) %>.and_return(<%= mock_file_name %>)
       get :edit, :id => "37"
       assigns[:<%= file_name %>].should equal(<%= mock_file_name %>)
     end
@@ -44,13 +44,13 @@ describe <%= controller_class_name %>Controller do
 
     describe "with valid params" do
       it "assigns a newly created <%= file_name %> as @<%= file_name %>" do
-        <%= stub! orm_class.build(class_name, params) %>.and_return(<%= mock_file_name(:save => true) %>)
+        <%= stub orm_class.build(class_name, params) %>.and_return(<%= mock_file_name(:save => true) %>)
         post :create, :<%= file_name %> => <%= params %>
         assigns[:<%= file_name %>].should equal(<%= mock_file_name %>)
       end
 
       it "redirects to the created <%= file_name %>" do
-        <%= stub! orm_class.build(class_name) %>.and_return(<%= mock_file_name(:save => true) %>)
+        <%= stub orm_class.build(class_name) %>.and_return(<%= mock_file_name(:save => true) %>)
         post :create, :<%= file_name %> => {}
         response.should redirect_to(<%= table_name.singularize %>_url(<%= mock_file_name %>))
       end
@@ -58,13 +58,13 @@ describe <%= controller_class_name %>Controller do
 
     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) %>.and_return(<%= mock_file_name(:save => false) %>)
+        <%= stub orm_class.build(class_name, params) %>.and_return(<%= mock_file_name(:save => false) %>)
         post :create, :<%= file_name %> => <%= params %>
         assigns[:<%= file_name %>].should equal(<%= mock_file_name %>)
       end
 
       it "re-renders the 'new' template" do
-        <%= stub! orm_class.build(class_name) %>.and_return(<%= mock_file_name(:save => false) %>)
+        <%= stub orm_class.build(class_name) %>.and_return(<%= mock_file_name(:save => false) %>)
         post :create, :<%= file_name %> => {}
         response.should render_template('new')
       end
@@ -82,13 +82,13 @@ describe <%= controller_class_name %>Controller do
       end
 
       it "assigns the requested <%= file_name %> as @<%= file_name %>" do
-        <%= stub! orm_class.find(class_name) %>.and_return(<%= mock_file_name(:update_attributes => true) %>)
+        <%= stub orm_class.find(class_name) %>.and_return(<%= mock_file_name(:update_attributes => true) %>)
         put :update, :id => "1"
         assigns[:<%= file_name %>].should equal(<%= mock_file_name %>)
       end
 
       it "redirects to the <%= file_name %>" do
-        <%= stub! orm_class.find(class_name) %>.and_return(<%= mock_file_name(:update_attributes => true) %>)
+        <%= stub orm_class.find(class_name) %>.and_return(<%= mock_file_name(:update_attributes => true) %>)
         put :update, :id => "1"
         response.should redirect_to(<%= table_name.singularize %>_url(<%= mock_file_name %>))
       end
@@ -96,13 +96,13 @@ describe <%= controller_class_name %>Controller do
 
     describe "with invalid params" do
       it "assigns the <%= file_name %> as @<%= file_name %>" do
-        <%= stub! orm_class.find(class_name) %>.and_return(<%= mock_file_name(:update_attributes => false) %>)
+        <%= stub orm_class.find(class_name) %>.and_return(<%= mock_file_name(:update_attributes => false) %>)
         put :update, :id => "1"
         assigns[:<%= file_name %>].should equal(<%= mock_file_name %>)
       end
 
       it "re-renders the 'edit' template" do
-        <%= stub! orm_class.find(class_name) %>.and_return(<%= mock_file_name(:update_attributes => false) %>)
+        <%= stub orm_class.find(class_name) %>.and_return(<%= mock_file_name(:update_attributes => false) %>)
         put :update, :id => "1"
         response.should render_template('edit')
       end
@@ -118,7 +118,7 @@ describe <%= controller_class_name %>Controller do
     end
 
     it "redirects to the <%= table_name %> list" do
-      <%= stub! orm_class.find(class_name) %>.and_return(<%= mock_file_name(:destroy => true) %>)
+      <%= stub orm_class.find(class_name) %>.and_return(<%= mock_file_name(:destroy => true) %>)
       delete :destroy, :id => "1"
       response.should redirect_to(<%= table_name %>_url)
     end

data/lib/rspec/rails/example/controller_example_group.rb

@@ -18,14 +18,14 @@ module ControllerExampleGroupBehaviour
 
   %w[get post put delete head].map do |method|
     eval <<-CODE
-      def #{method}(action)
-        @_action = action
+      def #{method}(*args)
+        @_action = args.shift
         super '/'
       end
     CODE
   end
 
   Rspec::Core.configure do |c|
-    c.include self, :behaviour => { :file_path => /\/spec\/controllers\// }
+    c.include self, :example_group => { :file_path => /\/spec\/controllers\// }
   end
 end

data/lib/rspec/rails/example/request_example_group.rb

@@ -21,6 +21,6 @@ module RequestExampleGroupBehaviour
   end
   
   Rspec::Core.configure do |c|
-    c.include self, :behaviour => { :file_path => /\/spec\/requests\// }
+    c.include self, :example_group => { :file_path => /\/spec\/requests\// }
   end
 end

data/lib/rspec/rails/version.rb

@@ -5,7 +5,7 @@ module Rspec # :nodoc:
         MAJOR  = 2
         MINOR  = 0
         TINY   = 0
-        PRE    = 'a4'
+        PRE    = 'a5'
 
         STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
 

data/rspec-rails.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-rails}
-  s.version = "2.0.0.a4"
+  s.version = "2.0.0.a5"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Chelimsky", "Chad Humphries"]
-  s.date = %q{2010-02-04}
+  s.date = %q{2010-02-07}
   s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
   s.extra_rdoc_files = [
     "README.markdown"
@@ -26,8 +26,8 @@ Gem::Specification.new do |s|
      "lib/generators/rspec/helper/helper_generator.rb",
      "lib/generators/rspec/helper/templates/helper_spec.rb",
      "lib/generators/rspec/install/install_generator.rb",
+     "lib/generators/rspec/install/templates/config/initializers/rspec_generator.rb.tt",
      "lib/generators/rspec/install/templates/lib/tasks/rspec.rake",
-     "lib/generators/rspec/install/templates/spec/rcov.opts",
      "lib/generators/rspec/install/templates/spec/spec.opts",
      "lib/generators/rspec/install/templates/spec/spec_helper.rb",
      "lib/generators/rspec/integration/integration_generator.rb",
@@ -71,14 +71,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rspec>, [">= 2.0.0.a2"])
+      s.add_runtime_dependency(%q<rspec>, [">= 2.0.0.a5"])
       s.add_runtime_dependency(%q<webrat>, ["= 0.7.0"])
     else
-      s.add_dependency(%q<rspec>, [">= 2.0.0.a2"])
+      s.add_dependency(%q<rspec>, [">= 2.0.0.a5"])
       s.add_dependency(%q<webrat>, ["= 0.7.0"])
     end
   else
-    s.add_dependency(%q<rspec>, [">= 2.0.0.a2"])
+    s.add_dependency(%q<rspec>, [">= 2.0.0.a5"])
     s.add_dependency(%q<webrat>, ["= 0.7.0"])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-rails
 version: !ruby/object:Gem::Version 
-  version: 2.0.0.a4
+  version: 2.0.0.a5
 platform: ruby
 authors: 
 - David Chelimsky
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-04 00:00:00 -06:00
+date: 2010-02-07 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,7 +21,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.0.a2
+        version: 2.0.0.a5
     version: 
 - !ruby/object:Gem::Dependency 
   name: webrat
@@ -53,8 +53,8 @@ files:
 - lib/generators/rspec/helper/helper_generator.rb
 - lib/generators/rspec/helper/templates/helper_spec.rb
 - lib/generators/rspec/install/install_generator.rb
+- lib/generators/rspec/install/templates/config/initializers/rspec_generator.rb.tt
 - lib/generators/rspec/install/templates/lib/tasks/rspec.rake
-- lib/generators/rspec/install/templates/spec/rcov.opts
 - lib/generators/rspec/install/templates/spec/spec.opts
 - lib/generators/rspec/install/templates/spec/spec_helper.rb
 - lib/generators/rspec/integration/integration_generator.rb

data/lib/generators/rspec/install/templates/spec/rcov.opts

@@ -1,2 +0,0 @@
---exclude "spec/*,gems/*"
---rails