assert 2.14.0 → 2.15.0

data/test/unit/view_tests.rb

@@ -1,38 +1,50 @@
 require 'assert'
-require 'assert/suite'
-require 'assert/view/base'
+require 'assert/view'
+
 require 'stringio'
+require 'assert/suite'
+require 'assert/view_helpers'
 
-class Assert::View::Base
+module Assert::View
 
   class UnitTests < Assert::Context
-    desc "Assert::View::Base"
+    desc "Assert::View"
+    subject { Assert::View }
+
+    should have_instance_method :require_user_view
+
+  end
+
+  class BaseTests < UnitTests
+    desc "Base"
     setup do
-      @io = StringIO.new("", "w+")
+      @io     = StringIO.new("", "w+")
       @config = Factory.modes_off_config
-      @view = Assert::View::Base.new(@io, @config, @config.suite)
+
+      @view = Assert::View::Base.new(@config, @io)
     end
     subject{ @view }
 
-    # accessors, base methods
-    should have_imeths :is_tty?, :view, :config, :suite, :fire
+    should have_readers :config
+    should have_imeths :view, :is_tty?, :ansi_styled_msg
+    should have_imeths :fire
     should have_imeths :before_load, :after_load
     should have_imeths :on_start, :on_finish, :on_interrupt
     should have_imeths :before_test, :after_test, :on_result
 
-    # common methods
-    should have_imeths :runner_seed, :count, :tests?, :all_pass?
-    should have_imeths :run_time, :test_rate, :result_rate
-    should have_imeths :test_run_time, :test_result_rate
-    should have_imeths :suite_contexts, :ordered_suite_contexts
-    should have_imeths :suite_files, :ordered_suite_files
-    should have_imeths :ordered_profile_tests, :show_test_profile_info?
-    should have_imeths :show_test_verbose_info?
-    should have_imeths :result_details_for, :matched_result_details_for, :show_result_details?
-    should have_imeths :ocurring_result_types, :result_summary_msg
-    should have_imeths :all_pass_result_summary_msg, :results_summary_sentence
-    should have_imeths :test_count_statement, :result_count_statement
-    should have_imeths :to_sentence
+    should "include the view helpers" do
+      assert_includes Assert::ViewHelpers, subject.class
+    end
+
+    should "default its style options" do
+      assert_false subject.styled
+
+      assert_nil subject.pass_styles
+      assert_nil subject.fail_styles
+      assert_nil subject.error_styles
+      assert_nil subject.skip_styles
+      assert_nil subject.ignore_styles
+    end
 
     should "default its result abbreviations" do
       assert_equal '.', subject.pass_abbrev
@@ -42,17 +54,45 @@ class Assert::View::Base
       assert_equal 'E', subject.error_abbrev
     end
 
+    should "know its config" do
+      assert_equal @config, subject.config
+    end
+
+    should "expose itself as `view`" do
+      assert_equal subject, subject.view
+    end
+
     should "know if it is a tty" do
       assert_equal !!@io.isatty, subject.is_tty?
     end
 
-  end
+    should "know how to build ansi styled messages" do
+      msg = Factory.string
+      result = [:pass, :fail, :error, :skip, :ignore].choice
 
-  class HandlerTests < Assert::Context
-    desc "Assert::View"
-    subject { Assert::View }
+      Assert.stub(subject, :is_tty?){ false }
+      Assert.stub(subject, :styled){ false }
+      assert_equal msg, subject.ansi_styled_msg(msg, result)
 
-    should have_instance_method :require_user_view
+      Assert.stub(subject, :is_tty?){ false }
+      Assert.stub(subject, :styled){ true }
+      assert_equal msg, subject.ansi_styled_msg(msg, result)
+
+      Assert.stub(subject, :is_tty?){ true }
+      Assert.stub(subject, :styled){ false }
+      assert_equal msg, subject.ansi_styled_msg(msg, result)
+
+      Assert.stub(subject, :is_tty?){ true }
+      Assert.stub(subject, :styled){ true }
+      Assert.stub(subject, "#{result}_styles"){ [] }
+      assert_equal msg, subject.ansi_styled_msg(msg, result)
+
+      styles = Factory.integer(3).times.map{ Assert::ViewHelpers::Ansi::CODES.keys.choice }
+      Assert.stub(subject, "#{result}_styles"){ styles }
+      exp_code = Assert::ViewHelpers::Ansi.code_for(*styles)
+      exp = exp_code + msg + Assert::ViewHelpers::Ansi.code_for(:reset)
+      assert_equal exp, subject.ansi_styled_msg(msg, result)
+    end
 
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: assert
 version: !ruby/object:Gem::Version
-  version: 2.14.0
+  version: 2.15.0
 platform: ruby
 authors:
 - Kelly Redding
@@ -9,22 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-23 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: ansi
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
+date: 2015-08-07 00:00:00.000000000 Z
+dependencies: []
 description: Test::Unit style testing framework, just better than Test::Unit.
 email:
 - kelly@kellyredding.com
@@ -47,11 +33,13 @@ files:
 - lib/assert/assertions.rb
 - lib/assert/cli.rb
 - lib/assert/config.rb
+- lib/assert/config_helpers.rb
 - lib/assert/context.rb
 - lib/assert/context/setup_dsl.rb
 - lib/assert/context/subject_dsl.rb
 - lib/assert/context/suite_dsl.rb
 - lib/assert/context/test_dsl.rb
+- lib/assert/default_view.rb
 - lib/assert/factory.rb
 - lib/assert/file_line.rb
 - lib/assert/macro.rb
@@ -64,18 +52,15 @@ files:
 - lib/assert/utils.rb
 - lib/assert/version.rb
 - lib/assert/view.rb
-- lib/assert/view/base.rb
-- lib/assert/view/default_view.rb
-- lib/assert/view/helpers/ansi_styles.rb
-- lib/assert/view/helpers/common.rb
+- lib/assert/view_helpers.rb
 - log/.gitkeep
 - test/helper.rb
 - test/support/diff_a.txt
 - test/support/diff_b.txt
 - test/support/factory.rb
 - test/support/inherited_stuff.rb
-- test/system/running_tests.rb
 - test/system/stub_tests.rb
+- test/system/test_tests.rb
 - test/unit/assert_tests.rb
 - test/unit/assertions/assert_block_tests.rb
 - test/unit/assertions/assert_empty_tests.rb
@@ -91,6 +76,7 @@ files:
 - test/unit/assertions/assert_same_tests.rb
 - test/unit/assertions/assert_true_false_tests.rb
 - test/unit/assertions_tests.rb
+- test/unit/config_helpers_tests.rb
 - test/unit/config_tests.rb
 - test/unit/context/setup_dsl_tests.rb
 - test/unit/context/subject_dsl_tests.rb
@@ -106,6 +92,7 @@ files:
 - test/unit/suite_tests.rb
 - test/unit/test_tests.rb
 - test/unit/utils_tests.rb
+- test/unit/view_helpers_tests.rb
 - test/unit/view_tests.rb
 - tmp/.gitkeep
 homepage: http://github.com/redding/assert
@@ -138,8 +125,8 @@ test_files:
 - test/support/diff_b.txt
 - test/support/factory.rb
 - test/support/inherited_stuff.rb
-- test/system/running_tests.rb
 - test/system/stub_tests.rb
+- test/system/test_tests.rb
 - test/unit/assert_tests.rb
 - test/unit/assertions/assert_block_tests.rb
 - test/unit/assertions/assert_empty_tests.rb
@@ -155,6 +142,7 @@ test_files:
 - test/unit/assertions/assert_same_tests.rb
 - test/unit/assertions/assert_true_false_tests.rb
 - test/unit/assertions_tests.rb
+- test/unit/config_helpers_tests.rb
 - test/unit/config_tests.rb
 - test/unit/context/setup_dsl_tests.rb
 - test/unit/context/subject_dsl_tests.rb
@@ -170,4 +158,5 @@ test_files:
 - test/unit/suite_tests.rb
 - test/unit/test_tests.rb
 - test/unit/utils_tests.rb
+- test/unit/view_helpers_tests.rb
 - test/unit/view_tests.rb

data/lib/assert/view/base.rb

@@ -1,91 +0,0 @@
-require 'assert/config'
-require 'assert/suite'
-require 'assert/result'
-
-module Assert::View
-
-  class Base
-
-    # include a bunch of common helper methods
-
-    require 'assert/view/helpers/common'
-    include Helpers::Common
-
-    # setup options and their default values
-
-    option 'pass_abbrev',   '.'
-    option 'fail_abbrev',   'F'
-    option 'ignore_abbrev', 'I'
-    option 'skip_abbrev',   'S'
-    option 'error_abbrev',  'E'
-
-    attr_reader :config, :suite
-
-    def initialize(output_io, *args)
-      @output_io = output_io
-      @suite, @config = [
-        args.last.kind_of?(Assert::Suite)  ? args.pop : nil,
-        args.last.kind_of?(Assert::Config) ? args.pop : nil
-      ]
-
-      @output_io.sync = true if @output_io.respond_to?(:sync=)
-    end
-
-    def is_tty?
-      !!@output_io.isatty
-    end
-
-    def view
-      self
-    end
-
-    def config
-      @config ||= Assert.config
-    end
-
-    def suite
-      @suite ||= Assert.suite
-    end
-
-    def fire(callback, *args)
-      self.send(callback, *args)
-    end
-
-    # Callbacks
-
-    # define callback handlers to output information.  handlers are
-    # instance_eval'd in the scope of the view instance.  any stdout is captured
-    # and sent to the io stream.
-
-    # available callbacks from the runner:
-    # * `before_load`:  called at the beginning, before the suite is loaded
-    # * `after_load`:   called after the suite is loaded, just before `on_start`
-    #                   functionally equivalent to `on_start`
-    # * `on_start`:     called when a loaded test suite starts running
-    # * `before_test`:  called before a test starts running
-    #                   the test is passed as an arg
-    # * `on_result`:    called when a running tests generates a result
-    #                   the result is passed as an arg
-    # * `after_test`:   called after a test finishes running
-    #                   the test is passed as an arg
-    # * `on_finish`:    called when the test suite is finished running
-    # * `on_interrupt`: called when the test suite is interrupted while running
-    #                   the interrupt exception is passed as an arg
-
-    def before_load(test_files); end
-    def after_load;              end
-    def on_start;                end
-    def before_test(test);       end
-    def on_result(result);       end
-    def after_test(test);        end
-    def on_finish;               end
-    def on_interrupt(err);       end
-
-    # IO capture
-
-    def puts(*args); @output_io.puts(*args); end
-    def print(*args); @output_io.print(*args); end
-
-  end
-
-end

data/lib/assert/view/helpers/ansi_styles.rb

@@ -1,25 +0,0 @@
-require 'ansi/code'
-
-module Assert::View::Helpers
-
-  module AnsiStyles
-
-    def result_ansi_styles(result)
-      view.styled ? view.send("#{result.to_sym}_styles") : []
-    end
-
-    def ansi_styled_msg(msg, styles=[])
-      if !(style = ansi_style(*styles)).empty? && self.is_tty?
-        style + msg + ANSI.send(:reset)
-      else
-        msg
-      end
-    end
-
-    def ansi_style(*ansi_codes)
-      ansi_codes.collect{|code| ANSI.send(code) rescue nil}.compact.join('')
-    end
-
-  end
-
-end

data/lib/assert/view/helpers/common.rb

@@ -1,209 +0,0 @@
-module Assert::View::Helpers
-
-  module Common
-
-    def self.included(receiver)
-      receiver.class_eval{ extend ClassMethods }
-    end
-
-    def runner_seed
-      self.config.runner_seed
-    end
-
-    def count(type)
-      self.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.suite.run_time
-    end
-
-    # get the formatted suite test rate
-    def test_rate(format = '%.6f')
-      format % self.suite.test_rate
-    end
-
-    # get the formatted suite result rate
-    def result_rate(format = '%.6f')
-      format % self.suite.result_rate
-    end
-
-    # get the formatted run time for an idividual test
-    def test_run_time(test, format = '%.6f')
-      format % test.run_time
-    end
-
-    # get the formatted result rate for an individual test
-    def test_result_rate(test, format = '%.6f')
-      format % test.result_rate
-    end
-
-    # get a uniq list of contexts for the test suite
-    def suite_contexts
-      @suite_contexts ||= self.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.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 ordered_profile_tests
-      suite.ordered_tests.sort{ |a, b| a.run_time <=> b.run_time }
-    end
-
-    def show_test_profile_info?
-      !!config.profile
-    end
-
-    def show_test_verbose_info?
-      !!config.verbose
-    end
-
-    # get all the result details for a set of tests
-    def result_details_for(tests, result_order = :normal)
-      test_index = 0
-      tests.collect do |test|
-        test_index += 1
-
-        details = test.results.collect do |result|
-          ResultDetails.new(result, test, test_index)
-        end
-        details.reverse! if result_order == :reversed
-        details
-      end.compact.flatten
-    end
-
-    # get all the result details for a set of tests matching a file or context
-    def matched_result_details_for(match, tests, result_order = :normal)
-      context_match = match.kind_of?(Class) && match.ancestors.include?(Assert::Context)
-      file_match = match.kind_of?(String)
-
-      matching_tests = if context_match
-        tests.select {|test| test.context_info.klass == match}
-      elsif file_match
-        tests.select {|test| test.context_info.file == match}
-      else
-        tests
-      end
-
-      result_details_for(matching_tests, result_order)
-    end
-
-    # only show result details for failed or errored results
-    # show result details if a skip or passed result was issues w/ a message
-    def show_result_details?(result)
-      ([:fail, :error].include?(result.to_sym)) ||
-      ([:skip, :ignore].include?(result.to_sym) && result.message)
-    end
-
-    # show any captured output
-    def captured_output(output)
-      "--- stdout ---\n"\
-      "#{output}"\
-      "--------------"
-    end
-
-    # return a list of result symbols that have actually occurred
-    def ocurring_result_types
-      @result_types ||= [
-        :pass, :fail, :ignore, :skip, :error
-      ].select { |result_sym| self.count(result_sym) > 0 }
-    end
-
-    # print a result summary message for a given result type
-    def result_summary_msg(result_type)
-      if result_type == :pass && self.all_pass?
-        self.all_pass_result_summary_msg
-      else
-        "#{self.count(result_type)} #{result_type.to_s}"
-      end
-    end
-
-    # generate an appropriate result summary msg for all tests passing
-    def all_pass_result_summary_msg
-      if self.count(:results) < 1
-        "uhh..."
-      elsif self.count(:results) == 1
-        "pass"
-      else
-        "all pass"
-      end
-    end
-
-    # generate a sentence fragment describing the breakdown of test results
-    # if a block is given, yield each msg in the breakdown for custom formatting
-    def results_summary_sentence
-      summaries = self.ocurring_result_types.collect do |result_sym|
-        summary_msg = self.result_summary_msg(result_sym)
-        block_given? ? yield(summary_msg, result_sym) : summary_msg
-      end
-      self.to_sentence(summaries)
-    end
-
-    def test_count_statement
-      "#{self.count(:tests)} test#{'s' if self.count(:tests) != 1}"
-    end
-
-    def result_count_statement
-      "#{self.count(:results)} result#{'s' if self.count(:results) != 1}"
-    end
-
-    # generate a comma-seperated sentence fragment given a list of things
-    def to_sentence(things)
-      if things.size <= 2
-        things.join(things.size == 2 ? ' and ' : '')
-      else
-        [things[0..-2].join(", "), things.last].join(", and ")
-      end
-    end
-
-    class ResultDetails
-      attr_reader :result, :test_index, :test, :output
-
-      def initialize(result, test, test_index)
-        @result = result
-        @test = test
-        @test_index = test_index
-        @output = test.output
-      end
-    end
-
-    module ClassMethods
-
-      def option(name, *default_vals)
-        default = default_vals.size > 1 ? default_vals : default_vals.first
-        define_method(name) do |*args|
-          if !(value = args.size > 1 ? args : args.first).nil?
-            instance_variable_set("@#{name}", value)
-          end
-          (val = instance_variable_get("@#{name}")).nil? ? default : val
-        end
-      end
-
-    end
-
-  end
-
-end