typo 5.0 → 5.0.1

data/spec/fixtures/profiles.yml

@@ -0,0 +1,11 @@
+admin:
+  label: admin
+  nicename: Typo administrator
+
+publisher:
+  label: publisher
+  nicename: Blog publisher
+
+contributor:
+  label: contributor
+  nicename: Contributor

data/spec/fixtures/tags.yml

@@ -1,13 +1,10 @@
 # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
 foo_tag:
-  id: 1
   name: foo
   display_name: foo
 bar_tag:
-  id: 2
   name: bar
   display_name: bar
 bazz_tag:
-  id: 3
   name: bazz
   display_name: bazz

data/spec/models/page_spec.rb

@@ -11,12 +11,12 @@ describe 'Given the fixture :first_page' do
     @page.permalink_url.should == 'http://myblog.net/pages/page_one'
   end
 
-  it '#edit_url should be: http://myblog.net/admin/pages/edit/9' do
-    @page.edit_url.should == 'http://myblog.net/admin/pages/edit/9'
+  it '#edit_url should be: http://myblog.net/admin/pages/edit/<page_id>' do
+    @page.edit_url.should == "http://myblog.net/admin/pages/edit/#{@page.id}"
   end
 
   it '#delete_url should work too' do
-    @page.delete_url.should == 'http://myblog.net/admin/pages/destroy/9'
+    @page.delete_url.should == "http://myblog.net/admin/pages/destroy/#{@page.id}"
   end
 
   it 'Pages cannot have the same name' do
@@ -44,7 +44,10 @@ end
 describe 'Given no pages' do
   it_should_behave_like "ValidPageHelper"
 
-  before(:each) { @page = Page.new }
+  before(:each) do
+    Page.delete_all
+    @page = Page.new
+  end
 
   it 'An empty page is invalid' do
     @page.should_not be_valid

data/spec/models/tag_spec.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe 'Given loaded fixtures' do
-  fixtures :tags, :contents, :articles_tags, :blogs
+  fixtures :tags, :contents, :blogs
 
   it 'we can Tag.get by name' do
     Tag.get('foo').should == tags(:foo_tag)

data/spec/spec_helper.rb

@@ -8,6 +8,7 @@ Spec::Runner.configure do |config|
   config.use_transactional_fixtures = true
   config.use_instantiated_fixtures  = false
   config.fixture_path = RAILS_ROOT + '/spec/fixtures'
+  config.global_fixtures = [:contents, :tags, :blogs, :profiles]
 
   config.before(:each) do
     CachedModel.cache_reset

data/test/fixtures/profiles.yml

@@ -1,16 +1,11 @@
-# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
-
 admin:
-  id: 1
   label: admin
   nicename: Typo administrator
 
 publisher:
-  id: 2
   label: publisher
   nicename: Blog publisher
 
 contributor:
-  id: 3
   label: contributor
-  nicename: Contributor
+  nicename: Contributor

data/test/fixtures/users.yml

@@ -10,8 +10,8 @@ tobi:
   notify_via_jabber: false
   notify_on_new_articles: false
   notify_on_comments: true
-  profile_id: 1
-  
+  profile: admin
+
 bob:
   id: 2
   login: bob
@@ -22,8 +22,8 @@ bob:
   notify_via_jabber: false
   notify_on_new_articles: true
   notify_on_comments: false
-  profile_id: 1
-  
+  profile: admin
+
 existingbob:
   id: 3
   login: existingbob
@@ -34,7 +34,7 @@ existingbob:
   notify_via_jabber: false
   notify_on_new_articles: false
   notify_on_comments: false
-  profile_id: 1
+  profile: admin
 
 longbob:
   id: 4
@@ -46,8 +46,8 @@ longbob:
   notify_via_jabber: false
   notify_on_new_articles: false
   notify_on_comments: false
-  profile_id: 1
-  
+  profile: admin
+
 randomuser:
   id: 5
   login: randomuser
@@ -58,4 +58,4 @@ randomuser:
   notify_via_jabber: false
   notify_on_new_articles: true
   notify_on_comments: true
-  profile_id: 1
+  profile: admin

data/vendor/plugins/rspec/CHANGES

@@ -1,11 +1,3 @@
-== Trunk
-
-* Fixed regression in 1.1 that caused failing examples to fail to generate their own names. Closes LH[#209].
-* Applied doc patch from Jens Krämer for capturing content_for
-* Applied patch from Alexander Lang to clean up story steps after each story. Closes LH[#198].
-* Applied patch from Josh Knowles to support 'string_or_response.should have_text(...)'. Closes LH[#193].
-* Applied patch from Ian Dees to quiet the Story Runner backtrace. Closes LH[#183].
-
 == Version 1.1.1
 
 Bug fix release.
@@ -20,7 +12,7 @@ The "tell me a story and go nest yourself" release.
 * Applied patch from Mike Vincent to handle generators rails > 2.0.1. Closes LH[#181]
 * Formatter.pending signature changed so it gets passed an ExampleGroup instance instead of the name ( LH[#180])
 * Fixed LH[#180] Spec::Rails::Example::ModelExampleGroup and friends show up in rspec/rails output
-* Spec::Rails no longer loads ActiveRecord extensions if it's disabled in config/boot.rb
+* Spec::Rails no longer loads ActiveRecord extensions if it's disablet in config/boot.rb
 * Applied LH[#178] small annoyances running specs with warnings enabled (Patch from Mikko Lehtonen)
 * Tighter integration with Rails fixtures. Take advantage of fixture caching to get performance improvements (Thanks to Pat Maddox, Nick Kallen, Jonathan Barnes, and Curtis)
 

data/vendor/plugins/rspec/examples/pure/helper_method_example.rb

@@ -1,14 +1,11 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
-module HelperMethodExample
-  describe "an example group with helper a method" do
-    def helper_method
-      "received call"
-    end
+describe "a context with helper a method" do
+  def helper_method
+    "received call"
+  end
   
-    it "should make that method available to specs" do
-      helper_method.should == "received call"
-    end
+  it "should make that method available to specs" do
+    helper_method.should == "received call"
   end
 end
-

data/vendor/plugins/rspec/lib/spec/example/example_methods.rb

@@ -64,22 +64,21 @@ module Spec
         @_defined_description || @_matcher_description || "NO NAME"
       end
       
-      def set_instance_variables_from_hash(ivars)
-        ivars.each do |variable_name, value|
-          # Ruby 1.9 requires variable.to_s on the next line
-          unless ['@_implementation', '@_defined_description', '@_matcher_description', '@method_name'].include?(variable_name.to_s)
+      def set_instance_variables_from_hash(instance_variables)
+        instance_variables.each do |variable_name, value|
+          unless ['@_implementation', '@_defined_description', '@_matcher_description', '@method_name'].index(variable_name)
             instance_variable_set variable_name, value
           end
         end
       end
 
       def run_with_description_capturing
-        begin
-          return instance_eval(&(@_implementation || PENDING_EXAMPLE_BLOCK))
-        ensure
-          @_matcher_description = Spec::Matchers.generated_description
-          Spec::Matchers.clear_generated_description
+        return_value = nil
+        
+        @_matcher_description = Matchers.capture_generated_description do
+          return_value = instance_eval(&(@_implementation || PENDING_EXAMPLE_BLOCK))
         end
+        return_value
       end
       
       protected

data/vendor/plugins/rspec/lib/spec/matchers.rb

@@ -139,8 +139,14 @@ module Spec
       def clear_generated_description
         self.generated_description = nil
       end
-    end
 
+      def capture_generated_description
+        yield
+        description = generated_description
+        clear_generated_description
+        description
+      end
+    end
     extend ModuleMethods
 
     def method_missing(sym, *args, &block) # :nodoc:

data/vendor/plugins/rspec/lib/spec/matchers/be.rb

@@ -124,9 +124,8 @@ module Spec
         def parse_expected(expected)
           if Symbol === expected
             @handling_predicate = true
-            ["be_an_","be_a_","be_"].each do |prefix|
-              if expected.starts_with?(prefix)
-                @prefix = prefix
+            ["be_an_","be_a_","be_"].each do |@prefix|
+              if expected.starts_with?(@prefix)
                 return "#{expected.to_s.sub(@prefix,"")}".to_sym
               end
             end

data/vendor/plugins/rspec/lib/spec/mocks/message_expectation.rb

@@ -39,8 +39,6 @@ module Spec
                                                     @expected_received_count < values.size
         end
         @return_block = block_given? ? return_block : lambda { value }
-        # Ruby 1.9 - see where this is used below
-        @ignore_args = !block_given?
       end
       
       # :call-seq:
@@ -130,14 +128,9 @@ module Spec
       
       def invoke_return_block(args, block)
         args << block unless block.nil?
-        # Ruby 1.9 - when we set @return_block to return values
-        # regardless of arguments, any arguments will result in
-        # a "wrong number of arguments" error
-        if @ignore_args
-          @return_block.call()
-        else
-          @return_block.call(*args)
-        end
+        value = @return_block.call(*args)
+    
+        value
       end
     end
     

data/vendor/plugins/rspec/lib/spec/runner/formatter/story/plain_text_formatter.rb

@@ -20,7 +20,6 @@ module Spec
           end
 
           def story_started(title, narrative)
-            @current_story_title = title
             @output.puts "Story: #{title}\n\n"
             narrative.each_line do |line|
               @output.print "  "
@@ -34,7 +33,6 @@ module Spec
           end
 
           def scenario_started(story_title, scenario_name)
-            @current_scenario_name = scenario_name
             @scenario_already_failed = false
             @output.print "\n\n  Scenario: #{scenario_name}"
             @scenario_ok = true
@@ -45,12 +43,12 @@ module Spec
           end
         
           def scenario_failed(story_title, scenario_name, err)
-            @options.backtrace_tweaker.tweak_backtrace(err)
             @failed_scenarios << [story_title, scenario_name, err] unless @scenario_already_failed
             @scenario_already_failed = true
           end
         
           def scenario_pending(story_title, scenario_name, msg)
+            @pending_steps << [story_title, scenario_name, msg]
             @pending_scenario_count += 1 unless @scenario_already_failed
             @scenario_already_failed = true
           end
@@ -60,8 +58,8 @@ module Spec
             unless @pending_steps.empty?
               @output.puts "\nPending Steps:"
               @pending_steps.each_with_index do |pending, i|
-                story_name, scenario_name, msg = pending
-                @output.puts "#{i+1}) #{story_name} (#{scenario_name}): #{msg}"
+                title, scenario_name, msg = pending
+                @output.puts "#{i+1}) #{title} (#{scenario_name}): #{msg}"
               end
             end
             unless @failed_scenarios.empty?
@@ -72,9 +70,9 @@ module Spec
     #{i+1}) #{title} (#{scenario_name}) FAILED
     #{err.class}: #{err.message}
     #{err.backtrace.join("\n")}
-]
+    ]
               end
-            end            
+            end
           end
         
           def step_succeeded(type, description, *args)
@@ -83,7 +81,6 @@ module Spec
         
           def step_pending(type, description, *args)
             found_step(type, description, false, *args)
-            @pending_steps << [@current_story_title, @current_scenario_name, description]
             @output.print " (PENDING)"
             @scenario_ok = false
           end

data/vendor/plugins/rspec/lib/spec/story/runner/story_parser.rb

@@ -26,14 +26,14 @@ module Spec
         def process_line(line)
           line.strip!
           case line
-          when /^Story: /           then @state.story(line)
-          when /^Scenario: /        then @state.scenario(line)
-          when /^Given:? /          then @state.given(line)
-          when /^GivenScenario:? /  then @state.given_scenario(line)
-          when /^When:? /           then @state.event(line)
-          when /^Then:? /           then @state.outcome(line)
-          when /^And:? /            then @state.one_more_of_the_same(line)
-          else                           @state.other(line)
+          when /^Story: /           : @state.story(line)
+          when /^Scenario: /        : @state.scenario(line)
+          when /^Given:? /          : @state.given(line)
+          when /^GivenScenario:? /  : @state.given_scenario(line)
+          when /^When:? /           : @state.event(line)
+          when /^Then:? /           : @state.outcome(line)
+          when /^And:? /            : @state.one_more_of_the_same(line)
+          else                        @state.other(line)
           end
         end
 

data/vendor/plugins/rspec/lib/spec/story/runner/story_runner.rb

@@ -48,7 +48,6 @@ module Spec
               @scenario_runner.run(scenario, world)
             end
             @listeners.each { |l| l.story_ended(story.title, story.narrative) }
-            World.step_mother.clear
           end
           unique_steps = World.step_names.uniq.sort
           @listeners.each { |l| l.collected_steps(unique_steps) }

data/vendor/plugins/rspec/lib/spec/version.rb

@@ -6,7 +6,7 @@ module Spec
       TINY   = 1
       RELEASE_CANDIDATE = nil
 
-      BUILD_TIME_UTC = 20071229014907
+      BUILD_TIME_UTC = 20071217181808
 
       STRING = [MAJOR, MINOR, TINY].join('.')
       TAG = "REL_#{[MAJOR, MINOR, TINY, RELEASE_CANDIDATE].compact.join('_')}".upcase.gsub(/\.|-/, '_')

data/vendor/plugins/rspec/spec/spec/example/example_methods_spec.rb

@@ -70,22 +70,6 @@ module Spec
         @example_group.run
         ExampleMethods.count.should == 5
       end
-      
-      describe "run_with_description_capturing" do
-        before(:each) do
-          @example_group = Class.new(ExampleGroup) do end
-          @example = @example_group.new("foo", &(lambda { 2.should == 2 }))
-          @example.run_with_description_capturing
-        end
-      
-        it "should provide the generated description" do
-          @example.instance_eval { @_matcher_description }.should == "should == 2"
-        end
-      
-        it "should clear the global generated_description" do
-          Spec::Matchers.generated_description.should == nil
-        end
-      end
     end
   end
 end

data/vendor/plugins/rspec/spec/spec/matchers/match_spec.rb

@@ -5,12 +5,12 @@ describe "should match(expected)" do
     "string".should match(/tri/)
   end
 
-  it "should fail when target (String) does not match expected (Regexp)" do
+  it "should fail when target (String) matches expected (Regexp)" do
     lambda {
       "string".should match(/rings/)
     }.should fail
   end
-  
+
   it "should provide message, expected and actual on failure" do
     matcher = match(/rings/)
     matcher.matches?("string")
@@ -19,7 +19,7 @@ describe "should match(expected)" do
 end
 
 describe "should_not match(expected)" do
-  it "should pass when target (String) matches does not match (Regexp)" do
+  it "should pass when target (String) matches expected (Regexp)" do
     "string".should_not match(/rings/)
   end
 

data/vendor/plugins/rspec/spec/spec/runner/formatter/story/plain_text_formatter_spec.rb

@@ -9,11 +9,8 @@ module Spec
           before :each do
             # given
             @out = StringIO.new
-            @tweaker = mock('tweaker')
-            @tweaker.stub!(:tweak_backtrace)
             @options = mock('options')
             @options.stub!(:colour).and_return(false)
-            @options.stub!(:backtrace_tweaker).and_return(@tweaker)
             @formatter = PlainTextFormatter.new(@options, @out)
           end
         
@@ -62,40 +59,6 @@ module Spec
             @out.string.should include("3 scenarios: 1 succeeded, 2 failed")
           end
         
-          it 'should end cleanly (no characters on the last line) with successes' do
-            # when
-            @formatter.run_started(1)
-            @formatter.scenario_started(nil, nil)
-            @formatter.scenario_succeeded('story', 'scenario')
-            @formatter.run_ended
-          
-            # then
-            @out.string.should =~ /\n\z/
-          end
-        
-          it 'should end cleanly (no characters on the last line) with failures' do
-            # when
-            @formatter.run_started(1)
-            @formatter.scenario_started(nil, nil)
-            @formatter.scenario_failed('story', 'scenario', exception_from { raise RuntimeError, 'oops' })
-            @formatter.run_ended
-          
-            # then
-            @out.string.should =~ /\n\z/
-          end
-        
-          it 'should end cleanly (no characters on the last line) with pending steps' do
-            # when
-            @formatter.run_started(1)
-            @formatter.scenario_started(nil, nil)
-            @formatter.step_pending(:then, 'do pend')
-            @formatter.scenario_pending('story', 'scenario', exception_from { raise RuntimeError, 'oops' })
-            @formatter.run_ended
-          
-            # then
-            @out.string.should =~ /\n\z/
-          end
-        
           it 'should summarize the number of pending scenarios when the run ends' do
             # when
             @formatter.run_started(3)
@@ -183,18 +146,14 @@ module Spec
           it 'should produce details of each pending step when the run ends' do
             # when
             @formatter.run_started(2)
-            @formatter.story_started('story 1', 'narrative')
-            @formatter.scenario_started('story 1', 'scenario 1')
-            @formatter.step_pending(:given, 'todo 1', [])
-            @formatter.story_started('story 2', 'narrative')
-            @formatter.scenario_started('story 2', 'scenario 2')
-            @formatter.step_pending(:given, 'todo 2', [])
+            @formatter.scenario_pending('story', 'scenario2', 'todo2')
+            @formatter.scenario_pending('story', 'scenario3', 'todo3')
             @formatter.run_ended
           
             # then
             @out.string.should include("Pending Steps:\n")
-            @out.string.should include("1) story 1 (scenario 1): todo 1")
-            @out.string.should include("2) story 2 (scenario 2): todo 2")
+            @out.string.should include("1) story (scenario2): todo2")
+            @out.string.should include("2) story (scenario3): todo3")
           end
         
           it 'should document a story title and narrative' do