riot 0.10.12 → 0.10.13.pre

data/CHANGELOG

@@ -1,3 +1,23 @@
+*0.10.13.pre*
+
+* Recording description as is. Providing #detailed_description for proper behavior [jaknowlden]
+
+    foo_context = context(Foo) {}
+    bar_context = foo_context.context(Bar) {}
+    bar_context.description
+    => Bar
+    bar_context.detailed_description
+    => "Foo Bar"
+
+* No longer assuming topic when no block provided to an assertion. Instead, assuming block fails by default. Use `asserts_topic` only now. [jaknowlden]
+
+    context "foo" do
+      setup { "bar" }
+      asserts_topic.kind_of(String)
+      asserts("topic").kind_of(String) # Will fail since block returns `false`
+      asserts("topic").equals(false) # Will actually pass :)
+    end
+
 *0.10.12*
 
 * Recognizing file and line number of an assertion declaration on failure [vandrijevik]

data/README.markdown

@@ -69,6 +69,18 @@ give a Symbol as the first argument to `asserts` and leave out the block.
     asserts(:first).equals("foo")
 
 
+If you're like me, you like to write a bunch of failing tests for a context and then make
+them pass. This can easily be done by simply calling an `asserts` or `should` command with
+no block returning the actual value.
+
+    asserts("something special")
+    should("do something special")
+
+Both of the above tests will fail. You can use this similar to a `should_eventually`. The
+difference is that `should_eventually` is not technically a failure and will therefore be
+ignored in time by (based on my experience). The above two blocks will actually show up as
+failures and should hopefully drive you to making them pass.
+
 ### Reading Riot's output
 
 Riot can output the test results in several ways, the default being *story reporting*. With

data/VERSION

@@ -1 +1 @@
-0.10.12
+0.10.13.pre

data/lib/riot/context.rb

@@ -1,5 +1,5 @@
 module Riot
-  RootContext = Struct.new(:setups, :teardowns)
+  RootContext = Struct.new(:setups, :teardowns, :detailed_description)
 
   module ContextHelpers
     def assertion_class; Assertion; end
@@ -21,7 +21,7 @@ module Riot
     attr_reader :parent
 
     def initialize(description, parent=nil, &definition)
-      @parent = parent || RootContext.new([],[])
+      @parent = parent || RootContext.new([],[], "")
       @description = description
       @contexts, @helpers, @setups, @assertions, @teardowns = [], [], [], [], []
       self.instance_eval(&definition)
@@ -129,6 +129,10 @@ module Riot
       runnables.each { |runnable| reporter.report(runnable.to_s, runnable.run(situation)) }
     end
 
+    def detailed_description
+      "#{parent.detailed_description} #{description}".strip
+    end
+
   private
 
     def runnables
@@ -138,7 +142,8 @@ module Riot
     def run_sub_contexts(reporter) @contexts.each { |ctx| ctx.run(reporter) }; end
 
     def new_context(description, klass, &definition)
-      (@contexts << klass.new("#{@description} #{description}", self, &definition)).last
+      # (@contexts << klass.new("#{@description} #{description}", self, &definition)).last
+      (@contexts << klass.new(description, self, &definition)).last
     end
 
     def new_assertion(scope, what, &definition)

data/lib/riot/reporter.rb

@@ -78,7 +78,7 @@ module Riot
   class StoryReporter < IOReporter
     def describe_context(context)
       super
-      puts context.description
+      puts context.detailed_description
     end
     def pass(description, message) puts "  + " + green("#{description} #{message}".strip); end
 
@@ -122,7 +122,7 @@ module Riot
     end
   private
     def test_detail(description, message)
-      "#{current_context.description} #{description} => #{message}"
+      "#{current_context.detailed_description} #{description} => #{message}"
     end
   end
 

data/lib/riot/runnable.rb

@@ -2,7 +2,7 @@ module Riot
   class RunnableBlock
     attr_reader :definition
     def initialize(description, &definition)
-      @description, @definition = description, definition || lambda { topic }
+      @description, @definition = description, definition || lambda { false }
     end
 
     def to_s; @description; end

data/lib/riot/situation.rb

@@ -1,8 +1,11 @@
 module Riot
   class Situation
-    attr_accessor :topic
+    def topic
+      @_topic
+    end
+
     def setup(&block)
-      @topic = self.instance_eval(&block)
+      @_topic = self.instance_eval(&block)
     end
 
     def helper(name, &block)

data/riot.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{riot}
-  s.version = "0.10.12"
+  s.version = "0.10.13.pre"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin 'Gus' Knowlden"]
-  s.date = %q{2010-02-11}
+  s.date = %q{2010-02-20}
   s.description = %q{An extremely fast, expressive, and context-driven unit-testing framework. A replacement for all other testing frameworks. Protest the slow test.}
   s.email = %q{gus@gusg.us}
   s.extra_rdoc_files = [

data/test/core/assertion_test.rb

@@ -35,29 +35,29 @@ context "An assertion" do
   context "with no block to provide the actual value" do
     setup do
       @situation = Riot::Situation.new
-      @situation.topic = "hello"
+      @situation.instance_variable_set(:@_topic, "hello")
       Riot::Assertion.new("test")
     end
-    should("uses block returning topic as default") do
-      topic.equals("hello")
-      result = topic.run(@situation)
-    end.equals([:pass, %Q{is equal to "hello"}])
+
+    should("return a block that returns false") do
+      topic.run(@situation)
+    end.equals([:fail, "Expected non-false but got false instead", nil, nil])
   end # with no block to provide the actual value
   
   context "with block expectation" do
     setup do
       @situation = Riot::Situation.new
-      @situation.topic = "hello"
-      Riot::Assertion.new("test")
+      @situation.instance_variable_set(:@_topic, "hello")
+      Riot::Assertion.new("test") { topic }
     end
 
     should("use block returning topic as default") do
       topic.equals { "hello" }
-      result = topic.run(@situation)
+      topic.run(@situation)
     end.equals([:pass, %Q{is equal to "hello"}])
 
     asserts("block expectation has access to the situation items") do
-      topic.equals { @topic }
+      topic.equals { @_topic }
       topic.run(@situation)
     end.equals([:pass, %Q{is equal to "hello"}])
   end # with block expectation

data/test/core/context_test.rb

@@ -84,7 +84,7 @@ context "The asserts_topic shortcut" do
   should("return an Assertion") { topic }.kind_of(Riot::Assertion)
 
   should("return the actual topic as the result of evaling the assertion") do
-    (situation = Riot::Situation.new).topic = "bar"
+    (situation = Riot::Situation.new).instance_variable_set(:@_topic, "bar")
     topic.equals("bar").run(situation)
   end.equals([:pass, %Q{is equal to "bar"}])
 
@@ -123,3 +123,14 @@ context "A context with a helper" do
   asserts("executing the helper") { upcase }.equals("FOO")
   asserts("calling a helper with an argument") { append("bar") }.equals("foobar")
 end
+
+
+context "A context with a description" do
+  Foo, Bar = Class.new {}, Class.new {}
+  setup do
+    Riot::Context.new(Foo) {}.context(Bar) {}
+  end
+
+  asserts(:description).equals(Bar)
+  asserts(:detailed_description).equals("Foo Bar")
+end

data/test/core/report_test.rb

@@ -119,7 +119,7 @@ context "DotMatrixReporter" do
       context.run(topic)
       @out.string
     end
-    asserts('puts a dot').matches('.')
+    asserts_topic('puts a dot').matches('.')
   end
   
   context 'with a failing test' do
@@ -131,9 +131,9 @@ context "DotMatrixReporter" do
       @out.string
     end
     
-    asserts('puts an F').matches('F')
-    asserts("puts the full context + assertion name").matches('whatever asserts nope!')
-    asserts("puts the failure reason").matches(/Expected .* but got false instead/)
+    asserts_topic('puts an F').matches('F')
+    asserts_topic("puts the full context + assertion name").matches('whatever asserts nope!')
+    asserts_topic("puts the failure reason").matches(/Expected .* but got false instead/)
   end
   
   context 'with an error test' do
@@ -145,9 +145,9 @@ context "DotMatrixReporter" do
       @out.string
     end
     
-    asserts('puts an E').matches('E')
-    asserts('puts the full context + assertion name').matches('whatever asserts bang')
-    asserts('puts the exception message').matches('BOOM')
-    asserts('puts the exception backtrace').matches(__FILE__)
+    asserts_topic('puts an E').matches('E')
+    asserts_topic('puts the full context + assertion name').matches('whatever asserts bang')
+    asserts_topic('puts the exception message').matches('BOOM')
+    asserts_topic('puts the exception backtrace').matches(__FILE__)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: riot
 version: !ruby/object:Gem::Version 
-  version: 0.10.12
+  version: 0.10.13.pre
 platform: ruby
 authors: 
 - Justin 'Gus' Knowlden
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-11 00:00:00 -06:00
+date: 2010-02-20 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -120,9 +120,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.3.1
   version: 
 requirements: []