rspec-rails 2.0.0.beta.10 → 2.0.0.beta.11

data/.document

@@ -0,0 +1,5 @@
+README.markdown
+lib/**/*.rb
+bin/*
+features/**/*.feature
+License.txt

data/.gitignore

@@ -2,3 +2,6 @@ tmp
 pkg
 .bundle
 rspec-rails-
+Gemfile.lock
+doc
+vendor

data/Gemfile

@@ -1,6 +1,8 @@
 source "http://rubygems.org"
-gem 'rails', :path => "./tmp/rails"
-gem 'rspec', '>= 2.0.0.beta'
+
+gem 'arel', :path => "./vendor/arel"
+gem 'rails', :path => "./vendor/rails"
+gem 'rspec', '>= 2.0.0.beta.10'
 gem 'cucumber'
 gem 'aruba'
 gem 'jeweler'

data/Rakefile

@@ -35,9 +35,10 @@ begin
   This version of rspec-rails only works with 
   versions of rails >= 3.0.0.pre.
 
-  This is beta software. If you are looking
-  for a supported production release, please
-  "gem install rspec-rails" (without --pre).
+  Be sure to run the following command in each of your
+  Rails apps if you're upgrading:
+
+    script/rails generate rspec
 
 #{"*"*50}
 EOM
@@ -56,17 +57,26 @@ end
 namespace :rails do
   desc "clone the rails repo"
   task :clone do
-    mkdir 'tmp' unless File.directory?('tmp')
-    unless File.directory?('tmp/rails')
-      Dir.chdir('tmp') do
+    mkdir 'vendor' unless File.directory?('vendor')
+    unless File.directory?('vendor/rails')
+      Dir.chdir('vendor') do
         sh "git clone git://github.com/rails/rails"
       end
     end
+    unless File.directory?('vendor/arel')
+      Dir.chdir('vendor') do
+        sh "git clone git://github.com/rails/arel"
+      end
+    end
   end
 
   desc "update the rails repo"
   task :update => :clone do
-    Dir.chdir('tmp/rails') do
+    Dir.chdir('vendor/rails') do
+      sh "git checkout master"
+      sh "git pull"
+    end
+    Dir.chdir('vendor/arel') do
       sh "git checkout master"
       sh "git pull"
     end
@@ -77,7 +87,8 @@ namespace :generate do
   desc "generate a fresh app with rspec installed"
   task :app => ["rails:clone"] do |t|
     unless File.directory?('./tmp/example_app')
-      ruby "./tmp/rails/bin/rails tmp/example_app --dev -m example_app_template.rb"
+      ruby "./vendor/rails/bin/rails new ./tmp/example_app"
+      system "cp ./templates/Gemfile ./tmp/example_app/" 
     end
   end
 
@@ -115,6 +126,8 @@ end
 desc 'clobber generated files'
 task :clobber do
   rm_rf "pkg"
+  rm_rf "tmp"
+  rm    "Gemfile.lock" if File.exist?("Gemfile.lock")
 end
 
 namespace :clobber do
@@ -124,11 +137,5 @@ namespace :clobber do
   end
 end
 
-namespace :bundle do
-  task :install do
-    sh "bundle install"
-  end
-end
-
-task :default => ["bundle:install", "clobber:app", "generate:app", "generate:stuff", :spec, :cucumber, :smoke]
+task :default => ["clobber:app", "generate:app", "generate:stuff", :smoke, :spec, :cucumber]
 

data/Upgrade.markdown

@@ -1,8 +1,20 @@
 # Upgrade to rspec-rails-2
 
-## What's changed
+## Controller specs
 
-### View specs
+### render_views
+
+Controller specs, by default, do _not_ render views. This helps keep the
+controller specs focused on the controller. Use `render_views` instead of
+rspec-1's `integrate_views` to tell the spec to render the views:
+
+    describe WidgetController do
+      render_views
+      
+      describe "GET index" do
+        ...
+
+## View specs
 
 Rails changed the way it renders partials, so to set an expectation that a partial
 gets rendered:

data/VERSION

@@ -1 +1 @@
-2.0.0.beta.10
+2.0.0.beta.11

data/features/support/env.rb

@@ -19,13 +19,21 @@ def write_symlink(file_or_dir)
   system "ln -s #{source} #{target}"
 end
 
+def copy(file_or_dir)
+  source = example_app_path(file_or_dir)
+  target = aruba_path(file_or_dir)
+  system "cp -r #{source} #{target}"
+end
+
 Before do
   steps %Q{
     Given a directory named "spec"
   }
 
   Dir['tmp/example_app/*'].each do |file_or_dir|
-    unless file_or_dir =~ /spec$/
+    if file_or_dir =~ /Gemfile/
+      copy(file_or_dir)
+    elsif !(file_or_dir =~ /spec$/)
       write_symlink(file_or_dir)
     end
   end

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

@@ -19,6 +19,16 @@ DESC
         directory 'lib'
       end
 
+      def copy_initializer_files
+        inside "config" do
+          empty_directory "initializers", :verbose => false
+
+          inside "initializers" do
+            template "rspec_generator.rb.tt", "rspec_generator.rb"
+          end
+        end
+      end
+
       def copy_autotest_files
         directory 'autotest'
       end

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

@@ -0,0 +1,6 @@
+<%= app_name %>.configure do
+  config.generators do |g|
+    g.integration_tool :rspec
+    g.test_framework   :rspec
+  end
+end

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

@@ -20,7 +20,8 @@ Rspec.configure do |config|
 
   config.fixture_path = "#{::Rails.root}/spec/fixtures"
 
-  # If you'd prefer not to run each of your examples within a transaction,
-  # uncomment the following line.
-  # config.use_transactional_examples = false
+  # If you're not using ActiveRecord, or you'd prefer not to run each of your
+  # examples within a transaction, comment the following line or assign false
+  # instead of true.
+  config.use_transactional_fixtures = true
 end

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

@@ -2,6 +2,76 @@ require 'action_controller'
 require 'webrat'
 
 module RSpec::Rails
+  # Extends ActionController::TestCase::Behavior to work with RSpec.
+  #
+  # == Examples
+  #
+  # == with stubs
+  #   
+  #   describe WidgetsController do
+  #     describe "GET index" do
+  #       it "assigns all widgets to @widgets" do
+  #         widget = stub_model(Widget)
+  #         Widget.stub(:all) { widget }
+  #         get :index
+  #         assigns(:widgets).should eq([widget])
+  #       end
+  #     end
+  #   end
+  #
+  # === with a factory
+  #
+  #   describe WidgetsController do
+  #     describe "GET index" do
+  #       it "assigns all widgets to @widgets" do
+  #         widget = Factory(:widget)
+  #         get :index
+  #         assigns(:widgets).should eq([widget])
+  #       end
+  #     end
+  #   end
+  #
+  # === with fixtures
+  #
+  #   describe WidgetsController do
+  #     describe "GET index" do
+  #       fixtures :widgets
+  #       it "assigns all widgets to @widgets" do
+  #         get :index
+  #         assigns(:widgets).should eq(Widget.all)
+  #       end
+  #     end
+  #   end
+  #
+  # == Matchers
+  #
+  # In addition to the stock matchers from rspec-expectations, controller
+  # specs add these matchers, which delegate to rails' assertions:
+  #
+  #   response.should render_template(*args)
+  #   => delegates to assert_template(*args)
+  #
+  #   response.should redirect_to(destination)
+  #   => delegates to assert_redirected_to(destination)
+  #
+  # == Isolation from views
+  #
+  # RSpec's preferred approach to spec'ing controller behaviour is to isolate
+  # the controller from its collaborators.  By default, therefore, controller
+  # example groups do not render views. This means that a view template need
+  # not even exist in order to run a controller spec, and you can still specify
+  # which template the controller should render.
+  #
+  # == View rendering
+  #
+  # If you prefer a more integrated approach, similar to that of
+  # Rails' functional tests, you can tell controller groups to
+  # render views with the +render_views+ declaration:
+  #
+  #   describe WidgetsController do
+  #     render_views
+  #     ...
+  #     
   module ControllerExampleGroup
     extend ActiveSupport::Concern
 

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

@@ -2,6 +2,30 @@ require 'webrat'
 require 'rspec/rails/view_assigns'
 
 module RSpec::Rails
+  # Extends ActionView::TestCase::Behavior
+  #
+  # == Examples
+  #
+  #   describe RoleBasedDisplayHelper do
+  #     describe "display_for" do
+  #       context "given the role of the current user" do
+  #         it "yields to the block" do
+  #           helper.stub(:current_user) { double(:roles => ['admin'] }
+  #           text = helper.display_for('admin') { "this text" }
+  #           text.should eq("this text")
+  #         end
+  #       end
+  #
+  #       context "given a different role that that of the current user" do
+  #         it "renders an empty String" do
+  #           helper.stub(:current_user) { double(:roles => ['manager'] }
+  #           text = helper.display_for('admin') { "this text" }
+  #           text.should eq("")
+  #         end
+  #       end
+  #     end
+  #   end
+  #
   module HelperExampleGroup
     extend  ActiveSupport::Concern
 
@@ -18,8 +42,8 @@ module RSpec::Rails
     end
 
     module InstanceMethods
-      # Returns an instance of ActionView::Base instrumented with this helper and
-      # any of the built-in rails helpers.
+      # Returns an instance of ActionView::Base with the helper being specified
+      # mixed in, along with any of the built-in rails helpers.
       def helper
         _view
       end

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

@@ -2,6 +2,23 @@ require 'webrat'
 require 'rspec/rails/view_assigns'
 
 module RSpec::Rails
+  # Extends ActionView::TestCase::Behavior
+  #
+  # == Examples
+  #
+  #   describe "widgets/index.html.erb" do
+  #     it "renders the @widgets" do
+  #       widgets = [
+  #         stub_model(Widget, :name => "Foo"),
+  #         stub_model(Widget, :name => "Bar")
+  #       ]
+  #       assign(:widgets, widgets)
+  #       render
+  #       rendered.should contain("Foo")
+  #       rendered.should contain("Bar")
+  #     end
+  #   end
+  #
   module ViewExampleGroup
     extend  ActiveSupport::Concern
 

data/lib/rspec/rails/fixture_support.rb

@@ -23,7 +23,7 @@ end
 
 RSpec.configure do |c|
   c.include RSpec::Rails::FixtureSupport
-  c.add_setting :use_transactional_fixtures, :default => true
+  c.add_setting :use_transactional_fixtures
   c.add_setting :use_transactional_examples, :alias => :use_transactional_fixtures
   c.add_setting :use_instantiated_fixtures
   c.add_setting :global_fixtures

data/lib/rspec/rails/view_rendering.rb

@@ -8,6 +8,7 @@ module RSpec
           metadata[:rspec_rails] ||= {}
         end
 
+        # See RSpec::Rails::ControllerExampleGroup
         def render_views
           metadata_for_rspec_rails[:render_views] = true
         end

data/rspec-rails.gemspec

@@ -5,18 +5,19 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-rails}
-  s.version = "2.0.0.beta.10"
+  s.version = "2.0.0.beta.11"
 
   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-06-02}
+  s.date = %q{2010-06-06}
   s.description = %q{RSpec-2 for Rails-3}
   s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
   s.extra_rdoc_files = [
     "README.markdown"
   ]
   s.files = [
-    ".gitignore",
+    ".document",
+     ".gitignore",
      "Gemfile",
      "README.markdown",
      "Rakefile",
@@ -24,7 +25,6 @@ Gem::Specification.new do |s|
      "VERSION",
      "autotest/discover.rb",
      "cucumber.yml",
-     "example_app_template.rb",
      "features/controller_specs/do_not_render_views.feature",
      "features/controller_specs/readers.feature",
      "features/controller_specs/render_views.feature",
@@ -43,6 +43,7 @@ Gem::Specification.new do |s|
      "lib/generators/rspec/helper/templates/helper_spec.rb",
      "lib/generators/rspec/install/install_generator.rb",
      "lib/generators/rspec/install/templates/autotest/discover.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/spec_helper.rb",
      "lib/generators/rspec/integration/integration_generator.rb",
@@ -67,7 +68,6 @@ Gem::Specification.new do |s|
      "lib/rspec-rails.rb",
      "lib/rspec/rails.rb",
      "lib/rspec/rails/adapters.rb",
-     "lib/rspec/rails/configuration.rb",
      "lib/rspec/rails/example.rb",
      "lib/rspec/rails/example/controller_example_group.rb",
      "lib/rspec/rails/example/helper_example_group.rb",
@@ -104,20 +104,22 @@ Gem::Specification.new do |s|
      "spec/spec_helper.rb",
      "spec/support/helpers.rb",
      "specs.watchr",
+     "templates/Gemfile",
      "templates/generate_stuff.rb",
      "templates/run_specs.rb"
   ]
   s.homepage = %q{http://github.com/rspec/rspec-rails}
   s.post_install_message = %q{**************************************************
 
-  Thank you for installing rspec-rails-2.0.0.beta.10!
+  Thank you for installing rspec-rails-2.0.0.beta.11!
 
   This version of rspec-rails only works with 
   versions of rails >= 3.0.0.pre.
 
-  This is beta software. If you are looking
-  for a supported production release, please
-  "gem install rspec-rails" (without --pre).
+  Be sure to run the following command in each of your
+  Rails apps if you're upgrading:
+
+    script/rails generate rspec
 
 **************************************************
 }
@@ -125,7 +127,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rspec}
   s.rubygems_version = %q{1.3.6}
-  s.summary = %q{rspec-rails-2.0.0.beta.10}
+  s.summary = %q{rspec-rails-2.0.0.beta.11}
   s.test_files = [
     "spec/rspec/rails/example/controller_example_group_spec.rb",
      "spec/rspec/rails/example/helper_example_group_spec.rb",
@@ -149,14 +151,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.beta.10"])
+      s.add_runtime_dependency(%q<rspec>, ["= 2.0.0.beta.11"])
       s.add_runtime_dependency(%q<webrat>, [">= 0.7.0"])
     else
-      s.add_dependency(%q<rspec>, ["= 2.0.0.beta.10"])
+      s.add_dependency(%q<rspec>, ["= 2.0.0.beta.11"])
       s.add_dependency(%q<webrat>, [">= 0.7.0"])
     end
   else
-    s.add_dependency(%q<rspec>, ["= 2.0.0.beta.10"])
+    s.add_dependency(%q<rspec>, ["= 2.0.0.beta.11"])
     s.add_dependency(%q<webrat>, [">= 0.7.0"])
   end
 end

data/spec/rspec/rails/example/helper_example_group_spec.rb

@@ -1,7 +1,9 @@
 require "spec_helper"
 
 module RSpec::Rails
-  describe HelperExampleGroup do
+  describe HelperExampleGroup::InstanceMethods do
+    module ::FoosHelper; end
+
     it "is included in specs in ./spec/views" do
       stub_metadata(
         :example_group => {:file_path => "./spec/helpers/whatever_spec.rb:15"}
@@ -10,13 +12,30 @@ module RSpec::Rails
       group.included_modules.should include(HelperExampleGroup)
     end
 
-    module ::FoosHelper; end
-
     it "provides a controller_path based on the helper module's name" do
-      helper_spec = Object.new
-      helper_spec.extend HelperExampleGroup::InstanceMethods
+      helper_spec = Object.new.extend HelperExampleGroup::InstanceMethods
       helper_spec.stub_chain(:running_example, :example_group, :describes).and_return(FoosHelper)
       helper_spec.__send__(:_controller_path).should == "foos"
     end
+
+    describe "#helper" do
+      it "returns the instance of AV::Base provided by AV::TC::Behavior" do
+        helper_spec = Object.new.extend HelperExampleGroup::InstanceMethods
+        av_tc_b_view = double('_view')
+        helper_spec.stub(:_view) { av_tc_b_view }
+        helper_spec.helper.should eq(av_tc_b_view)
+      end
+    end
+  end
+
+  describe HelperExampleGroup::ClassMethods do
+    describe "determine_default_helper_class" do
+      it "returns the helper module passed to describe" do
+        helper_spec = Object.new.extend HelperExampleGroup::ClassMethods
+        helper_spec.stub(:describes) { FoosHelper }
+        helper_spec.determine_default_helper_class("ignore this").
+          should eq(FoosHelper)
+      end
+    end
   end
 end

data/templates/Gemfile

@@ -0,0 +1,30 @@
+source 'http://rubygems.org'
+
+gem "rails", :path => "../../vendor/rails"
+
+gem 'sqlite3-ruby', :require => 'sqlite3'
+
+# Use unicorn as the web server
+# gem 'unicorn'
+
+# Deploy with Capistrano
+# gem 'capistrano'
+
+# To use debugger
+# gem 'ruby-debug'
+
+# Bundle the extra gems:
+# gem 'bj'
+# gem 'nokogiri', '1.4.1'
+# gem 'sqlite3-ruby', :require => 'sqlite3'
+# gem 'aws-s3', :require => 'aws/s3'
+
+# Bundle gems for certain environments:
+# gem 'rspec', :group => :test
+# group :test do
+#   gem 'webrat'
+# end
+
+group :test do
+  gem "rspec-rails", :path => "../../../rspec-rails"
+end

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - beta
-  - 10
-  version: 2.0.0.beta.10
+  - 11
+  version: 2.0.0.beta.11
 platform: ruby
 authors: 
 - David Chelimsky
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-02 00:00:00 -05:00
+date: 2010-06-06 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,8 +32,8 @@ dependencies:
         - 0
         - 0
         - beta
-        - 10
-        version: 2.0.0.beta.10
+        - 11
+        version: 2.0.0.beta.11
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -59,6 +59,7 @@ extensions: []
 extra_rdoc_files: 
 - README.markdown
 files: 
+- .document
 - .gitignore
 - Gemfile
 - README.markdown
@@ -67,7 +68,6 @@ files:
 - VERSION
 - autotest/discover.rb
 - cucumber.yml
-- example_app_template.rb
 - features/controller_specs/do_not_render_views.feature
 - features/controller_specs/readers.feature
 - features/controller_specs/render_views.feature
@@ -86,6 +86,7 @@ files:
 - lib/generators/rspec/helper/templates/helper_spec.rb
 - lib/generators/rspec/install/install_generator.rb
 - lib/generators/rspec/install/templates/autotest/discover.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/spec_helper.rb
 - lib/generators/rspec/integration/integration_generator.rb
@@ -110,7 +111,6 @@ files:
 - lib/rspec-rails.rb
 - lib/rspec/rails.rb
 - lib/rspec/rails/adapters.rb
-- lib/rspec/rails/configuration.rb
 - lib/rspec/rails/example.rb
 - lib/rspec/rails/example/controller_example_group.rb
 - lib/rspec/rails/example/helper_example_group.rb
@@ -147,6 +147,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/helpers.rb
 - specs.watchr
+- templates/Gemfile
 - templates/generate_stuff.rb
 - templates/run_specs.rb
 has_rdoc: true
@@ -156,14 +157,15 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing rspec-rails-2.0.0.beta.10!
+    Thank you for installing rspec-rails-2.0.0.beta.11!
   
     This version of rspec-rails only works with 
     versions of rails >= 3.0.0.pre.
   
-    This is beta software. If you are looking
-    for a supported production release, please
-    "gem install rspec-rails" (without --pre).
+    Be sure to run the following command in each of your
+    Rails apps if you're upgrading:
+  
+      script/rails generate rspec
   
   **************************************************
 
@@ -193,7 +195,7 @@ rubyforge_project: rspec
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: rspec-rails-2.0.0.beta.10
+summary: rspec-rails-2.0.0.beta.11
 test_files: 
 - spec/rspec/rails/example/controller_example_group_spec.rb
 - spec/rspec/rails/example/helper_example_group_spec.rb

data/example_app_template.rb

@@ -1,5 +0,0 @@
-$LOAD_PATH.unshift(File.expand_path('../lib', __FILE__))
-require 'rspec/rails/version'
-
-gem 'rspec-rails', :path => File.expand_path('../', __FILE__)
-

data/lib/rspec/rails/configuration.rb

@@ -1,8 +0,0 @@
-module RSpec
-  module Rails
-    module  Configuration
-      attr_accessor :fixture_path ,:global_fixtures 
-    end
-  end
-end
-