testme 0.5.85 → 0.6.2

data/README.md

@@ -5,6 +5,23 @@
       given simple: true
         is? :simple  
 
+## Cheatsheet
+- ` -'this is a test description'` - Describe the context (if necessary)
+- `test Player` - Defines the topic of the test
+- `test 'My Scenario'` - Non-unit test e.g scenario tests (all features still work)
+- `topic` - Retrieve the topic of the test
+- `given name: 'Flavie', class: 'Rogue'` - Provide a context
+- `given { topic.talk_to 'Deckard' }` - Create a context using a block
+- `given { topic.name = 'Flavie; topic.class = 'Rogue' }` - Code run inside a block will still automatically stub for you
+- `given :deckard_cains_name, name: Name.new(first: 'Deckard', last: 'Cain')` - Store a context
+- `given :deckard_cains_name` - Load a context
+- `given { topic.name.first = 'Deckard' }` - Create a stub chain
+- `also class: 'Rogue'` - Provide a context over the existing context
+- `is? :name, 'Flavie'` - Create an assertion
+- `is? :inventory[1], 'Arrows'` - Assertion with arguments
+- `is? { topic.inventory(1) == 'Arrows' }` - Assertion with block
+- `before do <block> end ` - Create a base context
+
 ## Detailed Example
 
     test Pizza
@@ -190,6 +207,10 @@ default test folder: `/test/**/*`
 
     test App::Account
 
+> For scenario testing, or testing a blank Object (all features will still work)
+
+    test 'An Idea'
+
 > This automatically creates an instance which you access with `topic`
 
     topic.name
@@ -202,6 +223,13 @@ default test folder: `/test/**/*`
 
 ***
 
+#### Describing or Commenting
+Use `-` followed by a String
+
+    -'this is a test description'
+
+***
+
 #### `given`
 > Set the context
 
@@ -310,13 +338,6 @@ default test folder: `/test/**/*`
 
 ***
 
-#### Describing or Commenting
-Use `-` followed by a String
-
-    -'this is a test description'
-
-***
-
 ## "This is too easy! How can I make this more challenging?"
 
 There is something about you that troubles me. Your manner is strange for a lonely code warrior.

data/bin/testme

@@ -72,3 +72,8 @@ else
     end
   end
 end
+
+if TestMe::failed?
+  abort("Test Failed")
+end
+

data/lib/formatter.rb

@@ -5,8 +5,6 @@ module TestMe
       case format
         when :none
           return Formatter::None.new
-        when :text
-          return Formatter::Text.new
         when :console
           return Formatter::Console.new
         when :html
@@ -49,11 +47,9 @@ module TestMe
         log "     also " + context_to_string(desc, stubs, &block)
       end
 
-      def is? method, actual, expected
-        success = actual == expected
-
+      def is? method, actual, expected, success
         if method.class == Proc
-          log '      is ' + block_to_string(&method) + '? ' + (success ? 'YES'.bright.green : "NO, it was '#{actual}'".bright.red) + "\n\n"
+          log '      is ' + block_to_string(&method) + '? ' + (success ? 'YES'.bright.green : "NO".bright.red) + "\n\n"
         else
           log '      is ' + method.to_s + ', ' + expected.to_s.yellow + '? ' + (success ? 'YES'.bright.green : "NO, it was '#{actual}'".bright.red) + "\n\n"
         end
@@ -66,7 +62,7 @@ module TestMe
       def describe msg
         log '    ' + msg.bright.yellow
       end
-
+ 
     private
       def block_to_string &block
         loc = block.source_location
@@ -100,61 +96,5 @@ module TestMe
       end
 
     end
-
-    class Text < Console
-      def test topic
-        log "test " + topic.to_s
-      end
-
-      def given desc=nil, stubs=nil, &block
-        log "given " + context_to_string(desc, stubs, &block)
-      end
-
-      def also desc=nil, stubs=nil, &block
-        log "also " + context_to_string(desc, stubs, &block)
-      end
-
-      def is? method, actual, expected
-        success = actual == expected
-
-        log 'is ' + method.to_s + ', ' + expected.to_s + '? ' + (success ? 'YES' : "NO, it was '#{actual}'")
-      end
-
-      def compile
-        #do nothing
-      end
-
-      def describe msg
-        log msg
-      end
-
-    private
-      def block_to_string &block
-        "(block)"
-      end
-
-      def context_to_string desc=nil, stubs=nil, &block
-        str = ""
-
-        if desc.class == String || desc.class == Symbol
-          str += ":#{desc}: "
-        end
-
-        if desc.class == Hash
-          stubs = desc
-        end
-
-        if stubs
-          str += stubs.map{|k,v| (k.to_s + ': ' + v.to_s)}.join(', ')
-        end
-
-        if block
-          str += block_to_string(&block)
-        end
-
-        return str
-      end
-    end
-
   end
 end

data/lib/logic.rb

@@ -1,4 +1,6 @@
 module TestMe
+  @@failed = false
+
   def topic
     @topic
   end
@@ -84,7 +86,9 @@ module TestMe
       result = actual == expected
     end
 
-    @@formatter.is? method, actual, expected
+    @@formatter.is? method, actual, expected, result
+    
+    @@failed = true if result == false
 
     result
   end
@@ -94,10 +98,15 @@ module TestMe
   end
 
   def self.formatter
-    return @@formatter
+    @@formatter
+  end
+  
+  def self.failed?
+    @@failed
   end
 
 private
+
   class Context
     attr_accessor :name, :block, :stubs
   end

data/lib/testme.rb

@@ -91,7 +91,7 @@ end
 
 #testme.format
   # choose how results are displayed
-  # options: :none, :text, :console
+  # options: :none, :console
   # default: :console
 
 #testme.colors

data/test/testme.test.rb

@@ -1,3 +1,2 @@
 test 'TestMe'
  -'Topic creation'
- 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testme
 version: !ruby/object:Gem::Version
-  version: 0.5.85
+  version: 0.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-28 00:00:00.000000000 Z
+date: 2012-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -87,7 +87,6 @@ files:
 - spec/spec_helper.rb
 - spec/testme_spec.rb
 - test/double.test.rb
-- test/formatter.test.rb
 - test/testme.test.rb
 - testme.gemspec
 homepage: http://github.com/danielshuey/testme
@@ -102,12 +101,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1897896740676466632
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1897896740676466632
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/test/formatter.test.rb

@@ -1,13 +0,0 @@
-module TestMe::Formatter
-  class Text
-    def log msg
-      return msg
-    end
-  end
-end
-
-test TestMe::Formatter::Text
-  is? :test[TestMe::Formatter::Text], 'test TestMe::Formatter::Text'
-  is? :given[{description: "I format things"}], 'given description: I format things'
-  is? :also[{description: "I format things"}], 'also description: I format things'
-  is? :describe['testme'], 'testme'