assert 2.14.0 → 2.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa3c97970bacaed419dd9a2986302c8f7381ef8c
-  data.tar.gz: 0bf830c19a718be854960e6ddbb6b6bdf30f78fa
+  metadata.gz: 977f66c154b34e18051876043c6ef149048f3c24
+  data.tar.gz: 4ad230cae2d6fbe5895456d04f421843bbdb43e6
 SHA512:
-  metadata.gz: e7dffb68840de736888b0f7aa2c4159677eb820d75a83be49c2568b1ab796ad28135cae9e397eb341b857fb2aa6bbc577d890720094d626c6b4bb3ba3042779c
-  data.tar.gz: 772c42c5f472a9973d9d59bbc0d3e61a44886e58a7ed25d9f3cd0d6a1d15bc651da563a06ae1a455b6afd8d232cd64e3222014aaeb8e92e2cf7620b49128d909
+  metadata.gz: 9ea117fae5c227ae573763287d76156b11b923afa80b50c63223deb6f001605eac1eb55302f08f85ecc134eedf49efb90973cec640b6e1a11c75509100a8ccad
+  data.tar.gz: cf13653df60d7b5c295d2a43523923423998ae9c7b40f60bc95d95044af0577a96107d5d04a553d9de8c799bde111599d6656e2d678adcdee0ecb33750aa61e9

data/README.md

@@ -428,7 +428,7 @@ Use this if you prefer a 3rd-party tool (like awesome_print or something) over t
 
 ## Viewing Test Results
 
-`Assert::View::DefaultView` is the default handler for viewing test results.  Its output goes something like this:
+`Assert::DefaultView` is the default view for test results.  Its output goes something like this:
 
 * before the run starts, output some info about the test suite that is about to run
 * print out result abbreviations as the test results are generated
@@ -438,7 +438,7 @@ Use this if you prefer a 3rd-party tool (like awesome_print or something) over t
 
 You can run a test suite and get a feel for what this default outputs.  The view has a few options you can tweak:
 
-* `styled`: whether to apply ANSI styles to the output, default `true`
+* `styled`: whether to apply ansi styles to the output, default `true`
 * `pass_styles`: how to style pass result output, default `:green`
 * `fail_styles`: default `:red, :bold`
 * `error_styles`: default `:yellow, :bold`
@@ -534,7 +534,7 @@ Tests produce results as they are executed.  Every `assert` statement produces a
 
 ### View
 
-A `View` object is responsible for rendering test result output.  Assert provides a `Assert::View::Base` object to provide common helpers and default runner callback handlers for building views.  Assert also provides a `Assert::View::DefaultView` that it renders its output with.  See the "Viewing Test Results" section below for more details.
+A `View` object is responsible for rendering test result output.  Assert provides a `Assert::View::Base` object to provide common helpers and default runner callback handlers for building views.  Assert also provides an `Assert::DefaultView` that it renders its output with.  See the "Viewing Test Results" section below for more details.
 
 ### Macro
 

data/assert.gemspec

@@ -18,6 +18,4 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency("ansi", ["~> 1.3"])
-
 end

data/lib/assert/assert_runner.rb

@@ -45,7 +45,7 @@ module Assert
     end
 
     def run
-      self.config.runner.run(self.config.suite, self.config.view)
+      self.config.runner.run
     end
 
     private

data/lib/assert/assertions.rb

@@ -294,7 +294,7 @@ module Assert
         end
       end
 
-      def exception_details(raised_msg=nil, no_raised_msg=nil)
+      def exception_details(raised_msg = nil, no_raised_msg = nil)
         if @exception
           backtrace = Assert::Result::Backtrace.new(@exception.backtrace)
           [ raised_msg,

data/lib/assert/config.rb

@@ -1,3 +1,8 @@
+require 'assert/default_view'
+require 'assert/runner'
+require 'assert/suite'
+require 'assert/utils'
+
 module Assert
 
   class Config
@@ -21,7 +26,7 @@ module Assert
 
     def initialize(settings = nil)
       @suite  = Assert::Suite.new(self)
-      @view   = Assert::View::DefaultView.new($stdout, self, @suite)
+      @view   = Assert::DefaultView.new(self, $stdout)
       @runner = Assert::Runner.new(self)
 
       @test_dir    = "test"

data/lib/assert/config_helpers.rb

@@ -0,0 +1,75 @@
+module Assert
+
+  module ConfigHelpers
+
+    def runner_seed
+      self.config.runner_seed
+    end
+
+    def count(type)
+      self.config.suite.count(type)
+    end
+
+    def tests?
+      self.count(:tests) > 0
+    end
+
+    def all_pass?
+      self.count(:pass) == self.count(:results)
+    end
+
+    # get the formatted suite run time
+    def run_time(format = '%.6f')
+      format % self.config.suite.run_time
+    end
+
+    # get the formatted suite test rate
+    def test_rate(format = '%.6f')
+      format % self.config.suite.test_rate
+    end
+
+    # get the formatted suite result rate
+    def result_rate(format = '%.6f')
+      format % self.config.suite.result_rate
+    end
+
+    # get a uniq list of contexts for the test suite
+    def suite_contexts
+      @suite_contexts ||= self.config.suite.tests.inject([]) do |contexts, test|
+        contexts << test.context_info.klass
+      end.uniq
+    end
+
+    def ordered_suite_contexts
+      self.suite_contexts.sort{ |a,b| a.to_s <=> b.to_s }
+    end
+
+    # get a uniq list of files containing contexts for the test suite
+    def suite_files
+      @suite_files ||= self.config.suite.tests.inject([]) do |files, test|
+        files << test.context_info.file
+      end.uniq
+    end
+
+    def ordered_suite_files
+      self.suite_files.sort{ |a,b| a.to_s <=> b.to_s }
+    end
+
+    def show_test_profile_info?
+      !!self.config.profile
+    end
+
+    def show_test_verbose_info?
+      !!self.config.verbose
+    end
+
+    # return a list of result symbols that have actually occurred
+    def ocurring_result_types
+      @result_types ||= [:pass, :fail, :ignore, :skip, :error].select do |sym|
+        self.count(sym) > 0
+      end
+    end
+
+  end
+
+end

data/lib/assert/context.rb

@@ -33,19 +33,23 @@ module Assert
 
         if self.suite.test_methods.include?(klass_method_name)
           puts "WARNING: redefining '#{klass_method_name}'"
-          puts "  from: #{called_from}"
+          puts "  from: #{caller.first}"
         else
           self.suite.test_methods << klass_method_name
         end
 
-        ci = Suite::ContextInfo.new(self, nil, caller.first)
-        test = Test.new(method_name.to_s, ci, self.suite.config, :code => method_name)
-        self.suite.tests << test
+        self.suite.tests << Test.for_method(
+          method_name.to_s,
+          Suite::ContextInfo.new(self, nil, caller.first),
+          self.suite.config
+        )
       end
     end
 
-    def initialize(running_test, config)
-      @__running_test__, @__assert_config__ = running_test, config
+    def initialize(running_test, config, result_callback)
+      @__running_test__    = running_test
+      @__assert_config__   = config
+      @__result_callback__ = result_callback
     end
 
     # check if the assertion is a truthy value, if so create a new pass result, otherwise
@@ -75,17 +79,17 @@ module Assert
 
     # adds a Pass result to the end of the test's results
     # does not break test execution
-    def pass(pass_msg=nil)
+    def pass(pass_msg = nil)
       capture_result do |test, backtrace|
-        Assert::Result::Pass.new(test, pass_msg, backtrace)
+        Assert::Result::Pass.for_test(test, pass_msg, backtrace)
       end
     end
 
     # adds an Ignore result to the end of the test's results
     # does not break test execution
-    def ignore(ignore_msg=nil)
+    def ignore(ignore_msg = nil)
       capture_result do |test, backtrace|
-        Assert::Result::Ignore.new(test, ignore_msg, backtrace)
+        Assert::Result::Ignore.for_test(test, ignore_msg, backtrace)
       end
     end
 
@@ -96,15 +100,17 @@ module Assert
         raise Result::TestFailure, message || ''
       else
         capture_result do |test, backtrace|
-          Assert::Result::Fail.new(test, message || '', backtrace)
+          Assert::Result::Fail.for_test(test, message || '', backtrace)
         end
       end
     end
     alias_method :flunk, :fail
 
     # adds a Skip result to the end of the test's results and breaks test execution
-    def skip(skip_msg=nil)
-      raise(Result::TestSkipped, skip_msg || '')
+    def skip(skip_msg = nil, called_from = nil)
+      err = Result::TestSkipped.new(skip_msg || '')
+      err.set_backtrace([called_from]) if called_from
+      raise(err)
     end
 
     # alter the backtraces of fail results generated in the given block
@@ -147,7 +153,7 @@ module Assert
     def capture_result
       if block_given?
         result = yield __running_test__, caller
-        __running_test__.results << result
+        __running_test__.capture_result(result, @__result_callback__)
         result
       end
     end

data/lib/assert/context/test_dsl.rb

@@ -7,38 +7,42 @@ class Assert::Context
 
   module TestDSL
 
-    def test(desc_or_macro, called_from=nil, first_caller=nil, &block)
+    def test(desc_or_macro, called_from = nil, first_caller = nil, &block)
       if desc_or_macro.kind_of?(Assert::Macro)
         instance_eval(&desc_or_macro)
       elsif block_given?
-        ci = Assert::Suite::ContextInfo.new(self, called_from, first_caller || caller.first)
-        test_name = desc_or_macro
-
         # create a test from the given code block
-        self.suite.tests << Assert::Test.new(test_name, ci, self.suite.config, &block)
+        self.suite.tests << Assert::Test.for_block(
+          desc_or_macro.kind_of?(Assert::Macro) ? desc_or_macro.name : desc_or_macro,
+          Assert::Suite::ContextInfo.new(self, called_from, first_caller || caller.first),
+          self.suite.config,
+          &block
+        )
       else
         test_eventually(desc_or_macro, called_from, first_caller || caller.first, &block)
       end
     end
 
-    def test_eventually(desc_or_macro, called_from=nil, first_caller=nil, &block)
-      ci = Assert::Suite::ContextInfo.new(self, called_from, first_caller || caller.first)
-      test_name = desc_or_macro.kind_of?(Assert::Macro) ? desc_or_macro.name : desc_or_macro
-      skip_block = block.nil? ? Proc.new { skip 'TODO' } : Proc.new { skip }
-
+    def test_eventually(desc_or_macro, called_from = nil, first_caller = nil, &block)
       # create a test from a proc that just skips
-      self.suite.tests << Assert::Test.new(test_name, ci, self.suite.config, &skip_block)
+      ci = Assert::Suite::ContextInfo.new(self, called_from, first_caller || caller.first)
+      self.suite.tests << Assert::Test.for_block(
+        desc_or_macro.kind_of?(Assert::Macro) ? desc_or_macro.name : desc_or_macro,
+        ci,
+        self.suite.config,
+        &proc { skip('TODO', ci.called_from) }
+      )
     end
     alias_method :test_skip, :test_eventually
 
-    def should(desc_or_macro, called_from=nil, first_caller=nil, &block)
+    def should(desc_or_macro, called_from = nil, first_caller = nil, &block)
       if !desc_or_macro.kind_of?(Assert::Macro)
         desc_or_macro = "should #{desc_or_macro}"
       end
       test(desc_or_macro, called_from, first_caller || caller.first, &block)
     end
 
-    def should_eventually(desc_or_macro, called_from=nil, first_caller=nil, &block)
+    def should_eventually(desc_or_macro, called_from = nil, first_caller = nil, &block)
       if !desc_or_macro.kind_of?(Assert::Macro)
         desc_or_macro = "should #{desc_or_macro}"
       end

data/lib/assert/{view/default_view.rb → default_view.rb}

@@ -1,13 +1,11 @@
-require 'assert/view/base'
+require 'assert/view'
 
-module Assert::View
+module Assert
 
   # This is the default view used by assert.  It renders ansi test output
   # designed for terminal viewing.
 
-  class DefaultView < Base
-    require 'assert/view/helpers/ansi_styles'
-    include Helpers::AnsiStyles
+  class DefaultView < Assert::View::Base
 
     # setup options and their default values
 
@@ -26,9 +24,6 @@ module Assert::View
     end
 
     def on_start
-      if tests?
-        puts "Running tests in random order, seeded with \"#{runner_seed}\""
-      end
     end
 
     def before_test(test)
@@ -40,10 +35,7 @@ module Assert::View
     end
 
     def on_result(result)
-      result_abbrev = self.send("#{result.to_sym}_abbrev")
-      styled_abbrev = ansi_styled_msg(result_abbrev, result_ansi_styles(result))
-
-      print styled_abbrev
+      print ansi_styled_msg(self.send("#{result.to_sym}_abbrev"), result)
     end
 
     def after_test(test)
@@ -61,7 +53,7 @@ module Assert::View
 
       # show profile output
       if show_test_profile_info?
-        ordered_profile_tests.each do |test|
+        config.suite.ordered_tests_by_run_time.each do |test|
           puts "#{test_run_time(test)} seconds,"\
                " #{test.result_count} results,"\
                " #{test_result_rate(test)} results/s --"\
@@ -71,8 +63,8 @@ module Assert::View
       end
 
       # style the summaries of each result set
-      styled_results_sentence = results_summary_sentence do |summary, sym|
-        ansi_styled_msg(summary, result_ansi_styles(sym))
+      styled_results_sentence = results_summary_sentence do |summary, result_sym|
+        ansi_styled_msg(summary, result_sym)
       end
 
       puts "#{result_count_statement}: #{styled_results_sentence}"
@@ -91,12 +83,12 @@ module Assert::View
       puts
 
       # output detailed results for the tests in reverse test/result order
-      tests = suite.ordered_tests.reverse
+      tests = config.suite.ordered_tests.reverse
       result_details_for(tests, :reversed).each do |details|
         if show_result_details?(details.result)
           # output the styled result details
           result = details.result
-          puts ansi_styled_msg(result.to_s, result_ansi_styles(result))
+          puts ansi_styled_msg(result.to_s, result)
 
           # output any captured stdout
           output = details.output

data/lib/assert/factory.rb

@@ -33,7 +33,7 @@ module Assert
     end
 
     def string(length = nil)
-      self.type_cast(Random.string(length), :string)
+      self.type_cast(Random.string(length || 10), :string)
     end
 
     def text(length = nil)
@@ -41,7 +41,7 @@ module Assert
     end
 
     def slug(length = nil)
-      self.type_cast(Random.slug_string(length), :string)
+      self.type_cast(Random.string(length || 5), :string)
     end
 
     def hex(length = nil)
@@ -122,11 +122,6 @@ module Assert
         [*0..((length || 10) - 1)].map{ |n| DICTIONARY[rand(DICTIONARY.size)] }.join
       end
 
-      def self.slug_string(length = nil)
-        length ||= 8
-        self.string(length).scan(/.{1,4}/).join('-')
-      end
-
       def self.hex_string(length = nil)
         length ||= 10
         self.integer(("f" * length).hex - 1).to_s(16).rjust(length, '0')

data/lib/assert/file_line.rb

@@ -3,12 +3,12 @@ module Assert
   class FileLine
 
     def self.parse(file_line_path)
-      self.new(*file_line_path.match(/(.+)\:(.+)/)[1..2])
+      self.new(*(file_line_path.to_s.match(/(.+)\:(.+)/) || [])[1..2])
     end
 
     attr_reader :file, :line
 
-    def initialize(file, line)
+    def initialize(file = nil, line = nil)
       @file, @line = file.to_s, line.to_s
     end
 
@@ -17,7 +17,11 @@ module Assert
     end
 
     def ==(other_file_line)
-      self.file == other_file_line.file && self.line == other_file_line.line
+      if other_file_line.kind_of?(FileLine)
+        self.file == other_file_line.file && self.line == other_file_line.line
+      else
+        super
+      end
     end
 
   end

data/lib/assert/macro.rb

@@ -7,7 +7,7 @@ module Assert
 
     attr_accessor :name
 
-    def initialize(name=nil, *args, &block)
+    def initialize(name = nil, *args, &block)
       raise ArgumentError unless block_given?
       @name = name || "run this macro"
       super()

data/lib/assert/macros/methods.rb

@@ -100,7 +100,7 @@ module Assert::Macros
       # private
 
       def _methods_macro_test(called_from)
-        @_methods_macro_test ||= should "respond to methods", called_from do
+        @_methods_macro_test ||= test "should respond to methods", called_from do
 
           self.class._methods_macro_instance_methods.each do |(method, called_from)|
             msg = "#{subject.class.name} does not have instance method ##{method}"