rspec-rails 2.0.0.beta.8 → 2.0.0.beta.9.1

data/spec/rspec/rails/mocks/stub_model_spec.rb

@@ -42,7 +42,7 @@ describe "stub_model" do
     lambda do
       model = stub_model(MockableModel, :changed => true, :attributes_with_quotes => {'this' => 'that'})
       model.save
-    end.should raise_error(Rspec::Rails::IllegalDataAccessException, /stubbed models are not allowed to access the database/)
+    end.should raise_error(RSpec::Rails::IllegalDataAccessException, /stubbed models are not allowed to access the database/)
   end
   
   it "should increment the id" do

data/spec/rspec/rails/transactional_database_support_spec.rb

@@ -1,11 +1,11 @@
 require 'spec_helper'
 
-describe Rspec::Rails::TransactionalDatabaseSupport do
+describe RSpec::Rails::TransactionalDatabaseSupport do
 
   let(:connection) { double('connection', :open_transactions => 1) }
   let(:test_bed) do
     Class.new do
-      include Rspec::Rails::TransactionalDatabaseSupport
+      include RSpec::Rails::TransactionalDatabaseSupport
       def active_record_configured?; true; end
     end.new
   end

data/spec/spec_helper.rb

@@ -3,11 +3,27 @@ Bundler.setup
 
 require 'rspec/rails'
 
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+
+# TODO - most of this is borrowed from rspec-core's spec_helper - should
+# be extracted to something we can use here
 def in_editor?
   ENV.has_key?('TM_MODE') || ENV.has_key?('EMACS') || ENV.has_key?('VIM')
 end
 
-Rspec.configure do |c|
-  c.color_enabled = !in_editor?
+class RSpec::Core::ExampleGroup
+  def self.run_all(reporter=nil)
+    run(reporter || RSpec::Mocks::Mock.new('reporter').as_null_object)
+  end
 end
 
+RSpec.configure do |c|
+  c.color_enabled = !in_editor?
+  c.before(:each) do
+    @real_world = RSpec.world
+    RSpec.instance_variable_set(:@world, RSpec::Core::World.new)
+  end
+  c.after(:each) do
+    RSpec.instance_variable_set(:@world, @real_world)
+  end
+end

data/spec/support/helpers.rb

@@ -0,0 +1,20 @@
+module Helpers
+  def stub_metadata(additional_metadata)
+    stub_metadata = metadata_with(additional_metadata)
+    RSpec::Core::ExampleGroup.stub(:metadata) { stub_metadata }
+  end
+
+  def metadata_with(additional_metadata)
+    m = RSpec::Core::Metadata.new
+    m.process("example group")
+
+    group_metadata = additional_metadata.delete(:example_group)
+    if group_metadata
+      m[:example_group].merge!(group_metadata)
+    end
+    m.merge!(additional_metadata)
+    m
+  end
+
+  RSpec.configure {|c| c.include self}
+end

data/specs.watchr

@@ -5,12 +5,12 @@
 # --------------------------------------------------
 # Convenience Methods
 # --------------------------------------------------
-def all_test_files
+def all_spec_files
   Dir['spec/**/*_spec.rb']
 end
 
-def run_test_matching(thing_to_match)
-  matches = all_test_files.grep(/#{thing_to_match}/i)
+def run_spec_matching(thing_to_match)
+  matches = all_spec_files.grep(/#{thing_to_match}/i)
   if matches.empty?
     puts "Sorry, thanks for playing, but there were no matches for #{thing_to_match}"  
   else
@@ -24,17 +24,17 @@ def run(files_to_run)
   no_int_for_you
 end
 
-def run_all_tests
-  run(all_test_files.join(' '))
+def run_all_specs
+  run(all_spec_files.join(' '))
 end
 
 # --------------------------------------------------
 # Watchr Rules
 # --------------------------------------------------
-watch('^spec/(.*)_spec\.rb')   { |m| run_test_matching(m[1]) }
-watch('^lib/(.*)\.rb')         { |m| run_test_matching(m[1]) }
-watch('^spec/spec_helper\.rb') { run_all_tests }
-watch('^spec/support/.*\.rb')   { run_all_tests }
+watch('^spec/(.*)_spec\.rb')   { |m| run_spec_matching(m[1]) }
+watch('^lib/(.*)\.rb')         { |m| run_spec_matching(m[1]) }
+watch('^spec/spec_helper\.rb') { run_all_specs }
+watch('^spec/support/.*\.rb')   { run_all_specs }
 
 # --------------------------------------------------
 # Signal Handling
@@ -52,7 +52,7 @@ Signal.trap 'INT' do
     puts "   Did you just send me an INT? Ugh.  I'll quit for real if you do it again."
     @sent_an_int = true
     Kernel.sleep 1.5
-    run_all_tests
+    run_all_specs
   end
 end
 

data/templates/generate_stuff.rb

@@ -3,8 +3,10 @@ generate('controller wombats index')
 generate('integration_test widgets')
 generate('mailer Notifications signup')
 generate('model thing name:string')
-generate('observer widget')
+generate('helper things')
 generate('scaffold widget name:string')
+generate('observer widget')
+generate('scaffold gadget ') # scaffold with no attributes
 
 run('rake db:migrate')
 run('rake db:test:prepare')

metadata

@@ -7,8 +7,9 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - beta
-  - 8
-  version: 2.0.0.beta.8
+  - 9
+  - 1
+  version: 2.0.0.beta.9.1
 platform: ruby
 authors: 
 - David Chelimsky
@@ -17,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-27 00:00:00 -05:00
+date: 2010-05-27 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,8 +33,8 @@ dependencies:
         - 0
         - 0
         - beta
-        - 8
-        version: 2.0.0.beta.8
+        - 9
+        version: 2.0.0.beta.9
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -50,7 +51,7 @@ dependencies:
         version: 0.7.0
   type: :runtime
   version_requirements: *id002
-description: Rspec-2 for Rails-3
+description: RSpec-2 for Rails-3
 email: dchelimsky@gmail.com;chad.humphries@gmail.com
 executables: []
 
@@ -63,9 +64,16 @@ files:
 - Gemfile
 - README.markdown
 - Rakefile
+- Upgrade.markdown
 - 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
 - features/matchers/new_record_matcher.feature
+- features/model_specs/errors_on.feature
 - features/model_specs/transactional_examples.feature
 - features/step_definitions/model_steps.rb
 - features/support/env.rb
@@ -80,7 +88,6 @@ files:
 - 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
 - lib/generators/rspec/integration/templates/request_spec.rb
@@ -106,18 +113,33 @@ files:
 - lib/rspec/rails/adapters.rb
 - lib/rspec/rails/example.rb
 - lib/rspec/rails/example/controller_example_group.rb
+- lib/rspec/rails/example/helper_example_group.rb
 - lib/rspec/rails/example/mailer_example_group.rb
 - lib/rspec/rails/example/request_example_group.rb
 - lib/rspec/rails/example/view_example_group.rb
+- lib/rspec/rails/extensions.rb
+- lib/rspec/rails/extensions/active_record/base.rb
 - lib/rspec/rails/matchers.rb
 - lib/rspec/rails/mocks.rb
 - lib/rspec/rails/monkey.rb
 - lib/rspec/rails/monkey/action_controller/test_case.rb
+- lib/rspec/rails/monkey/action_view/test_case.rb
 - lib/rspec/rails/monkey/active_support/notifications/fanout.rb
+- lib/rspec/rails/null_resolver.rb
+- lib/rspec/rails/tasks/rspec.rake
 - lib/rspec/rails/transactional_database_support.rb
 - lib/rspec/rails/version.rb
+- lib/rspec/rails/view_assigns.rb
+- lib/rspec/rails/view_rendering.rb
 - rspec-rails.gemspec
+- spec/rspec/rails/example/controller_example_group_spec.rb
+- spec/rspec/rails/example/helper_example_group_spec.rb
+- spec/rspec/rails/example/mailer_example_group_spec.rb
+- spec/rspec/rails/example/request_example_group_spec.rb
+- spec/rspec/rails/example/view_example_group_spec.rb
+- spec/rspec/rails/example/view_rendering_spec.rb
 - spec/rspec/rails/matchers/be_a_new_spec.rb
+- spec/rspec/rails/matchers/errors_on_spec.rb
 - spec/rspec/rails/matchers/redirect_to_spec.rb
 - spec/rspec/rails/matchers/render_template_spec.rb
 - spec/rspec/rails/mocks/ar_classes.rb
@@ -125,6 +147,7 @@ files:
 - spec/rspec/rails/mocks/stub_model_spec.rb
 - spec/rspec/rails/transactional_database_support_spec.rb
 - spec/spec_helper.rb
+- spec/support/helpers.rb
 - specs.watchr
 - templates/generate_stuff.rb
 - templates/run_specs.rb
@@ -135,7 +158,7 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing rspec-rails-2.0.0.beta.8!
+    Thank you for installing rspec-rails-2.0.0.beta.9.1!
   
     This version of rspec-rails only works with 
     versions of rails >= 3.0.0.pre.
@@ -172,9 +195,16 @@ rubyforge_project: rspec
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: rspec-rails-2.0.0.beta.8
+summary: rspec-rails-2.0.0.beta.9.1
 test_files: 
+- spec/rspec/rails/example/controller_example_group_spec.rb
+- spec/rspec/rails/example/helper_example_group_spec.rb
+- spec/rspec/rails/example/mailer_example_group_spec.rb
+- spec/rspec/rails/example/request_example_group_spec.rb
+- spec/rspec/rails/example/view_example_group_spec.rb
+- spec/rspec/rails/example/view_rendering_spec.rb
 - spec/rspec/rails/matchers/be_a_new_spec.rb
+- spec/rspec/rails/matchers/errors_on_spec.rb
 - spec/rspec/rails/matchers/redirect_to_spec.rb
 - spec/rspec/rails/matchers/render_template_spec.rb
 - spec/rspec/rails/mocks/ar_classes.rb
@@ -182,3 +212,4 @@ test_files:
 - spec/rspec/rails/mocks/stub_model_spec.rb
 - spec/rspec/rails/transactional_database_support_spec.rb
 - spec/spec_helper.rb
+- spec/support/helpers.rb