protest 0.4.2 → 0.5.0

data/lib/protest/reports/turn.rb

@@ -10,21 +10,11 @@ module Protest
   # This report is based on the output displayed by TURN[http://github.com/TwP/turn],
   # Test::Unit Reporter (New) by Tim Pease.
   class Reports::Turn < Report
-    include Utils::Summaries
-    include Utils::ColorfulOutput
-
-    attr_reader :stream #:nodoc:
-
     PASS    = "PASS"
     FAIL    = "FAIL"
     ERROR   = "ERROR"
     PENDING = "PENDING"
 
-    # Set the stream where the report will be written to. STDOUT by default.
-    def initialize(stream=STDOUT)
-      @stream = stream
-    end
-
     on :enter do |report, context|
       report.puts context.description unless context.tests.empty?
     end

data/lib/protest/runner.rb

@@ -22,16 +22,15 @@ module Protest
     # Run a test and report if it passes, fails, or is pending. Takes the name
     # of the test as an argument.
     def report(test)
-      fire_event(:test, Test.new(test)) if test.real?
+      fire_event(:test, Test.new(test))
       test.run(@report)
-      fire_event(:pass, PassedTest.new(test)) if test.real?
+      fire_event(:pass, PassedTest.new(test))
     rescue Pending => e
       fire_event :pending, PendingTest.new(test, e)
     rescue AssertionFailed => e
       fire_event :failure, FailedTest.new(test, e)
     rescue Exception => e
       fire_event :error, ErroredTest.new(test, e)
-      raise if test.raise_exceptions?
     end
 
     protected

data/lib/protest/test_case.rb

@@ -17,8 +17,12 @@ module Protest
   end
 
   class << self
-    alias_method :describe,   :context
-    alias_method :story,      :context
+    alias_method :describe, :context
+
+    def story(description, &block)
+      warn "[DEPRECATED] `story` alias is deprecated. Use `describe` or `context` instead."
+      context(description, &block)
+    end
   end
 
   # A TestCase defines a suite of related tests. You can further categorize
@@ -28,14 +32,7 @@ module Protest
     # Run all tests in this context. Takes a Runner instance in order to
     # provide output.
     def self.run(runner)
-      runner.report(TestWrapper.new(:setup, self))
       tests.each {|test| runner.report(test) }
-      runner.report(TestWrapper.new(:teardown, self))
-    rescue Exception => e
-      # If any exception bubbles up here, then it means it was during the
-      # global setup/teardown blocks, so let's just skip the rest of this
-      # context.
-      return
     end
 
     # Tests added to this context.
@@ -43,14 +40,13 @@ module Protest
       @tests ||= []
     end
 
-    # Add a test to be run in this context. This method is aliased as +it+,
-    # +should+ and +scenario+ for your comfort.
+    # Add a test to be run in this context. This method is aliased as +it+
+    # and +should+ for your comfort.
     def self.test(name, &block)
       tests << new(name, caller.at(0), &block)
     end
 
-    # Add a setup block to be run before each test in this context. This method
-    # is aliased as +before+ for your comfort.
+    # Add a setup block to be run before each test in this context.
     def self.setup(&block)
       define_method :setup do
         super()
@@ -58,33 +54,7 @@ module Protest
       end
     end
 
-    # Add a +setup+ block that will be run *once* for the entire test case,
-    # before the first test is run.
-    #
-    # Keep in mind that while +setup+ blocks are evaluated on the context of the
-    # test, and thus you can share state between them, your tests will not be
-    # able to access instance variables set in a +global_setup+ block.
-    #
-    # This is usually not needed (and generally using it is a code smell, since
-    # you could make a test dependent on the state of other tests, which is a
-    # huge problem), but it comes in handy when you need to do expensive
-    # operations in your test setup/teardown and the tests won't modify the
-    # state set on this operations. For example, creating large amount of
-    # records in a database or filesystem, when your tests will only read these
-    # records.
-    #
-    # This method is aliased as +before_all+ for your comfort.
-    def self.global_setup(&block)
-      (class << self; self; end).class_eval do
-        define_method :do_global_setup do
-          super()
-          instance_eval(&block)
-        end
-      end
-    end
-
-    # Add a teardown block to be run after each test in this context. This
-    # method is aliased as +after+ for your comfort.
+    # Add a teardown block to be run after each test in this context.
     def self.teardown(&block)
       define_method :teardown do
         instance_eval(&block)
@@ -92,31 +62,9 @@ module Protest
       end
     end
 
-    # Add a +teardown+ block that will be run *once* for the entire test case,
-    # after the last test is run.
-    #
-    # Keep in mind that while +teardown+ blocks are evaluated on the context of
-    # the test, and thus you can share state between the tests and the
-    # teardown blocks, you will not be able to access instance variables set in
-    # a test from your +global_teardown+ block.
-    #
-    # See TestCase.global_setup for a discussion on why these methods are best
-    # avoided unless you really need them and use them carefully.
-    #
-    # This method is aliased as +after_all+ for your comfort.
-    def self.global_teardown(&block)
-      (class << self; self; end).class_eval do
-        define_method :do_global_teardown do
-          instance_eval(&block)
-          super()
-        end
-      end
-    end
-
     # Define a new test context nested under the current one. All +setup+ and
     # +teardown+ blocks defined on the current context will be inherited by the
-    # new context. This method is aliased as +describe+ and +story+ for your 
-    # comfort.
+    # new context. This method is aliased as +describe+ for your comfort.
     def self.context(description, &block)
       subclass = Class.new(self)
       subclass.class_eval(&block) if block
@@ -129,18 +77,29 @@ module Protest
       # descriptive output when running your tests.
       attr_accessor :description
 
-      alias_method :describe,   :context
-      alias_method :story,      :context
+      alias_method :describe, :context
+      alias_method :it,       :test
+      alias_method :should,   :test
 
-      alias_method :before,     :setup
-      alias_method :after,      :teardown
+      def story(description, &block)
+        warn "[DEPRECATED] `story` alias is deprecated. Use `describe` or `context` instead."
+        context(description, &block)
+      end
 
-      alias_method :before_all, :global_setup
-      alias_method :after_all,  :global_teardown
+      def scenario(name, &block)
+        warn "[DEPRECATED] `scenario` alias is deprecated. Use `test`, `it` or `should` instead."
+        test(name, &block)
+      end
+
+      def before(&block)
+        warn "[DEPRECATED] `before` alias is deprecated. Use `setup` instead."
+        setup(&block)
+      end
 
-      alias_method :it,         :test
-      alias_method :should,     :test
-      alias_method :scenario,   :test
+      def after(&block)
+        warn "[DEPRECATED] `after` alias is deprecated. Use `teardown` instead."
+        teardown(&block)
+      end
     end
 
     # Initialize a new instance of a single test. This test can be run in
@@ -209,16 +168,6 @@ module Protest
       @name
     end
 
-    # Tests must not re-raise exceptions
-    def raise_exceptions?
-      false
-    end
-
-    # This is a real test
-    def real?
-      true
-    end
-
     private
 
     def setup #:nodoc:
@@ -236,47 +185,13 @@ module Protest
     end
     private_class_method :sanitize_description
 
-    def self.do_global_setup
-    end
-    private_class_method :do_global_setup
-
-    def self.do_global_teardown
-    end
-    private_class_method :do_global_teardown
-
     def self.description #:nodoc:
       parent = ancestors[1..-1].detect {|a| a < Protest::TestCase }
       "#{parent.description rescue nil} #{@description}".strip
     end
 
     def self.inherited(child)
-      Protest.add_test_case(child)
-    end
-
-    # Provides the TestCase API for global setup/teardown blocks, so they can be
-    # "faked" as tests into the reporter (they aren't counted towards the total
-    # number of tests but they could count towards the number of failures/errors.)
-    class TestWrapper #:nodoc:
-      attr_reader :name
-
-      def initialize(type, test_case)
-        @type = type
-        @test = test_case
-        @name = "Global #{@type} for #{test_case.description}"
-      end
-
-      def run(report)
-        @test.send("do_global_#{@type}")
-      end
-
-      def raise_exceptions?
-        true
-      end
-
-      # This is not a real test but a fake one
-      def real?
-        false
-      end
+      Protest.test_cases << child
     end
   end
 end

data/lib/protest/utils/summaries.rb

@@ -49,7 +49,7 @@ module Protest
 
       # Call on +:end+ to print a list of failures (failed assertions) and errors
       # (unrescued exceptions), including file and line number where the test
-      # failed, and a short backtrace.
+      # failed, and a backtrace.
       #
       # It will not output anything if there weren't any failures or errors.
       #
@@ -73,7 +73,7 @@ module Protest
           colorize_as = ErroredTest === error ? :errored : :failed
           puts "  #{pad(index+1, pad_indexes)}) #{test_type(error)}: `#{error.test_name}' (on line #{error.line} of `#{error.file}')", colorize_as
           puts indent("With `#{error.error_message}'", 6 + pad_indexes), colorize_as
-          indent(error.backtrace[0..2], 6 + pad_indexes).each {|backtrace| puts backtrace, colorize_as }
+          indent(error.backtrace, 6 + pad_indexes).each {|backtrace| puts backtrace, colorize_as }
           puts
         end
       end

data/lib/protest/version.rb

@@ -0,0 +1,3 @@
+module Protest
+  VERSION = "0.5.0"
+end

data/protest.gemspec

@@ -1,43 +1,17 @@
 # -*- coding: utf-8 -*-
-Gem::Specification.new do |s|
-  s.name    = "protest"
-  s.version = "0.4.2"
-  s.date    = "2010-10-22"
-
-  s.description = "Protest is a tiny, simple, and easy-to-extend test framework"
-  s.summary     = s.description
-  s.homepage    = "http://protestrb.com"
 
-  s.authors = ["Nicolás Sanguinetti", "Matías Flores"]
-  s.email   = "mflores@atlanware.com"
+require "./lib/protest/version"
 
-  s.require_paths     = ["lib"]
-  s.rubyforge_project = "protest"
-  s.has_rdoc          = true
-  s.rubygems_version  = "1.3.1"
-
-  s.files = %w[
-.gitignore
-LICENSE
-README.rdoc
-Rakefile
-protest.gemspec
-lib/protest.rb
-lib/protest/utils.rb
-lib/protest/utils/backtrace_filter.rb
-lib/protest/utils/summaries.rb
-lib/protest/utils/colorful_output.rb
-lib/protest/test_case.rb
-lib/protest/tests.rb
-lib/protest/runner.rb
-lib/protest/stories.rb
-lib/protest/report.rb
-lib/protest/reports.rb
-lib/protest/reports/progress.rb
-lib/protest/reports/documentation.rb
-lib/protest/reports/summary.rb
-lib/protest/reports/turn.rb
-lib/protest/reports/stories.rb
-lib/protest/reports/stories/pdf.rb
-]
+Gem::Specification.new do |s|
+  s.name          = "protest"
+  s.version       = Protest::VERSION
+  s.summary       = "Protest is a tiny, simple, and easy-to-extend test framework"
+  s.description   = "Protest is a tiny, simple, and easy-to-extend test framework for ruby."
+  s.homepage      = "http://protestrb.com"
+  s.authors       = ["Nicolás Sanguinetti", "Matías Flores"]
+  s.email         = "flores.matias@gmail.com"
+  s.license       = "MIT"
+  s.require_paths = ["lib"]
+  s.files         = %w{ .gitignore CHANGELOG.md LICENSE README.md Rakefile protest.gemspec }
+  s.files        += Dir["lib/**/*.rb"]
 end

metadata

@@ -1,89 +1,68 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: protest
-version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 2
-  version: 0.4.2
+version: !ruby/object:Gem::Version
+  version: 0.5.0
+  prerelease: 
 platform: ruby
-authors: 
-- "Nicol\xC3\xA1s Sanguinetti"
-- "Mat\xC3\xADas Flores"
+authors:
+- Nicolás Sanguinetti
+- Matías Flores
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-10-22 00:00:00 -03:00
-default_executable: 
+date: 2013-06-07 00:00:00.000000000 Z
 dependencies: []
-
-description: Protest is a tiny, simple, and easy-to-extend test framework
-email: mflores@atlanware.com
+description: Protest is a tiny, simple, and easy-to-extend test framework for ruby.
+email: flores.matias@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
+- CHANGELOG.md
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - protest.gemspec
-- lib/protest.rb
-- lib/protest/utils.rb
-- lib/protest/utils/backtrace_filter.rb
-- lib/protest/utils/summaries.rb
-- lib/protest/utils/colorful_output.rb
-- lib/protest/test_case.rb
-- lib/protest/tests.rb
-- lib/protest/runner.rb
-- lib/protest/stories.rb
 - lib/protest/report.rb
-- lib/protest/reports.rb
-- lib/protest/reports/progress.rb
 - lib/protest/reports/documentation.rb
+- lib/protest/reports/progress.rb
 - lib/protest/reports/summary.rb
 - lib/protest/reports/turn.rb
-- lib/protest/reports/stories.rb
-- lib/protest/reports/stories/pdf.rb
-has_rdoc: true
+- lib/protest/reports.rb
+- lib/protest/runner.rb
+- lib/protest/test_case.rb
+- lib/protest/tests.rb
+- lib/protest/utils/backtrace_filter.rb
+- lib/protest/utils/colorful_output.rb
+- lib/protest/utils/summaries.rb
+- lib/protest/utils.rb
+- lib/protest/version.rb
+- lib/protest.rb
 homepage: http://protestrb.com
-licenses: []
-
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: protest
-rubygems_version: 1.3.7
+rubyforge_project: 
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Protest is a tiny, simple, and easy-to-extend test framework
 test_files: []
-
+has_rdoc: