assert 2.4.0 → 2.5.0

data/test/unit/test_tests.rb

@@ -1,22 +1,21 @@
 require 'assert'
 require 'assert/test'
 
+require 'assert/config'
+
 class Assert::Test
 
   class BasicTests < Assert::Context
     desc "a test obj"
     setup do
       @test_code = lambda{ assert(true) }
-      @context_class = Factory.context_class{ desc "context class" }
+      @context_class = Factory.modes_off_context_class{ desc "context class" }
       @context_info  = Factory.context_info(@context_class)
-      @test = Factory.test("should do something amazing", @context_info, @test_code)
-    end
-    teardown do
-      TEST_ASSERT_SUITE.tests.clear
+      @test = Factory.test("should do something amazing", @context_info, :code => @test_code)
     end
     subject{ @test }
 
-    should have_readers :name, :code, :context_info
+    should have_readers :name, :context_info, :config, :code
     should have_accessors :results, :output
     should have_imeths :run, :result_count, :context_class
     should have_imeths *Assert::Result.types.keys.collect{ |k| "#{k}_results" }
@@ -26,9 +25,22 @@ class Assert::Test
       assert_equal exp_name, subject.name
     end
 
-    should "know it's context class and code" do
+    should "know it's context class" do
       assert_equal @context_class, subject.context_class
+    end
+
+    should "know its config" do
+      cust_config = Assert::Config.new
+      assert_equal cust_config, Factory.test(cust_config).config
+    end
+
+    should "get its code from any passed opt, falling back on any given block" do
       assert_equal @test_code, subject.code
+
+      given_block = Proc.new{ assert(false) }
+      assert_equal given_block, Factory.test(&given_block).code
+
+      assert_kind_of Proc, Factory.test.code
     end
 
     should "have zero results before running" do
@@ -238,15 +250,11 @@ class Assert::Test
   class CaptureOutTests < BasicTests
     desc "when capturing std out"
     setup do
-      @test = Factory.test("stdout") do
+      @capture_config = Assert::Config.new(:capture_output => true)
+      @test = Factory.test("stdout", @capture_config) do
         puts "std out from the test"
         assert true
       end
-      @orig_capture = Assert.config.capture_output
-      Assert.config.capture_output true
-    end
-    teardown do
-      Assert.config.capture_output @orig_capture
     end
 
     should "capture any io from the test" do
@@ -259,7 +267,7 @@ class Assert::Test
   class FullCaptureOutTests < CaptureOutTests
     desc "across setup, teardown, and meth calls"
     setup do
-      @test = Factory.test("fullstdouttest") do
+      @test = Factory.test("fullstdouttest", @capture_config) do
         puts "std out from the test"
         assert a_method_an_assert_calls
       end

data/test/unit/utils_tests.rb

@@ -2,6 +2,7 @@ require 'assert'
 require 'assert/utils'
 
 require 'tempfile'
+require 'assert/config'
 
 module Assert::Utils
 
@@ -15,41 +16,34 @@ module Assert::Utils
     should have_imeths :show, :show_for_diff
     should have_imeths :tempfile
     should have_imeths :stdlib_pp_proc, :default_use_diff_proc, :syscmd_diff_proc
+    should have_imeths :git_changed_proc
 
   end
 
   class ShowTests < UnitTests
     desc "`show`"
     setup do
-      @orig_pp_objs = Assert.config.pp_objects
-      @orig_pp_proc = Assert.config.pp_proc
-      @new_pp_proc  = Proc.new{ |input| 'herp derp' }
-    end
-    teardown do
-      Assert.config.pp_proc(@orig_pp_proc)
-      Assert.config.pp_objects(@orig_pp_objs)
+      @pp_config = Assert::Config.new({
+        :pp_objects => true,
+        :pp_proc => Proc.new{ |input| 'herp derp' }
+      })
     end
 
     should "use `inspect` to show objs when `pp_objects` setting is false" do
-      Assert.config.pp_objects(false)
-
       @objs.each do |obj|
-        assert_equal obj.inspect, subject.show(obj)
+        assert_equal obj.inspect, subject.show(obj, Factory.modes_off_config)
       end
     end
 
     should "use `pp_proc` to show objs when `pp_objects` setting is true" do
-      Assert.config.pp_objects(true)
-      Assert.config.pp_proc(@new_pp_proc)
-
       @objs.each do |obj|
-        assert_equal @new_pp_proc.call(obj), subject.show(obj)
+        assert_equal @pp_config.pp_proc.call(obj), subject.show(obj, @pp_config)
       end
     end
 
   end
 
-  class ShowForDiffTests < UnitTests
+  class ShowForDiffTests < ShowTests
     desc "`show_for_diff`"
     setup do
       @w_newlines = { :string => "herp derp, derp herp\nherpderpedia" }
@@ -58,12 +52,12 @@ module Assert::Utils
 
     should "call show, escaping newlines" do
       exp_out = "{:string=>\"herp derp, derp herp\nherpderpedia\"}"
-      assert_equal exp_out, subject.show_for_diff(@w_newlines)
+      assert_equal exp_out, subject.show_for_diff(@w_newlines, Factory.modes_off_config)
     end
 
     should "make any obj ids generic" do
       exp_out = "#<struct #<Class:0xXXXXXX> a=\"aye\", b=\"bee\">"
-      assert_equal exp_out, subject.show_for_diff(@w_obj_id)
+      assert_equal exp_out, subject.show_for_diff(@w_obj_id, Factory.modes_off_config)
     end
 
   end
@@ -88,12 +82,12 @@ module Assert::Utils
     desc "`stdlib_pp_proc`"
 
     should "build a pp proc that uses stdlib `PP.pp` to pretty print objects" do
-      exp_obj_pps = @objs.map{ |o| "\n#{PP.pp(o, '', 79).strip}\n" }
+      exp_obj_pps = @objs.map{ |o| PP.pp(o, '', 79).strip }
       act_obj_pps = @objs.map{ |o| subject.stdlib_pp_proc.call(o) }
       assert_equal exp_obj_pps, act_obj_pps
 
       cust_width = 1
-      exp_obj_pps = @objs.map{ |o| "\n#{PP.pp(o, '', cust_width).strip}\n" }
+      exp_obj_pps = @objs.map{ |o| PP.pp(o, '', cust_width).strip }
       act_obj_pps = @objs.map{ |o| subject.stdlib_pp_proc(cust_width).call(o) }
       assert_equal exp_obj_pps, act_obj_pps
     end
@@ -131,7 +125,7 @@ module Assert::Utils
     end
 
     should "use the diff syscmd to output the diff between the exp/act show output" do
-      exp_diff_out = `diff --unified=-1 #{@diff_a_file} #{@diff_b_file}`.tap do |out|
+      exp_diff_out = `diff --unified=-1 #{@diff_a_file} #{@diff_b_file}`.strip.tap do |out|
         out.sub!(/^\-\-\- .+/, "--- expected")
         out.sub!(/^\+\+\+ .+/, "+++ actual")
       end
@@ -141,7 +135,7 @@ module Assert::Utils
 
     should "allow you to specify a custom syscmd" do
       cust_syscmd = 'diff'
-      exp_diff_out = `#{cust_syscmd} #{@diff_a_file} #{@diff_b_file}`.tap do |out|
+      exp_diff_out = `#{cust_syscmd} #{@diff_a_file} #{@diff_b_file}`.strip.tap do |out|
         out.sub!(/^\-\-\- .+/, "--- expected")
         out.sub!(/^\+\+\+ .+/, "+++ actual")
       end

data/test/unit/view_tests.rb

@@ -3,22 +3,25 @@ require 'assert/suite'
 require 'assert/view/base'
 require 'stringio'
 
-module Assert::View
+class Assert::View::Base
 
   class UnitTests < Assert::Context
-    desc "the base view"
+    desc "Assert::View::Base"
     setup do
-      @view = Assert::View::Base.new(StringIO.new("", "w+"), Assert::Suite.new)
+      @io = StringIO.new("", "w+")
+      @config = Factory.modes_off_config
+      @view = Assert::View::Base.new(@io, @config, @config.suite)
     end
     subject{ @view }
 
     # accessors, base methods
-    should have_imeths :view, :suite, :fire
+    should have_imeths :is_tty?, :view, :config, :suite, :fire
     should have_imeths :before_load, :after_load, :on_start, :on_finish
     should have_imeths :before_test, :after_test, :on_result
 
     # common methods
-    should have_imeths :run_time, :runner_seed, :count, :tests?, :all_pass?
+    should have_imeths :runner_seed, :count, :tests?, :all_pass?
+    should have_imeths :run_time, :test_rate, :result_rate
     should have_imeths :suite_contexts, :ordered_suite_contexts
     should have_imeths :suite_files, :ordered_suite_files
     should have_imeths :result_details_for, :show_result_details?
@@ -35,6 +38,10 @@ module Assert::View
       assert_equal 'E', subject.error_abbrev
     end
 
+    should "know if it is a tty" do
+      assert_equal !!@io.isatty, subject.is_tty?
+    end
+
   end
 
   class HandlerTests < Assert::Context

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: assert
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 27
   prerelease: 
   segments: 
   - 2
-  - 4
+  - 5
   - 0
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-11-20 00:00:00 Z
+date: 2014-01-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ansi
@@ -56,7 +56,12 @@ files:
 - lib/assert/assert_runner.rb
 - lib/assert/assertions.rb
 - lib/assert/cli.rb
+- lib/assert/config.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/macro.rb
 - lib/assert/macros/methods.rb
 - lib/assert/result.rb
@@ -74,6 +79,7 @@ files:
 - 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/unit/assert_tests.rb
@@ -89,10 +95,13 @@ files:
 - test/unit/assertions/assert_raises_tests.rb
 - test/unit/assertions/assert_respond_to_tests.rb
 - test/unit/assertions/assert_same_tests.rb
+- test/unit/assertions/assert_true_false_tests.rb
 - test/unit/assertions_tests.rb
-- test/unit/context/basic_singleton_tests.rb
-- test/unit/context/setup_teardown_singleton_tests.rb
-- test/unit/context/test_should_singleton_tests.rb
+- test/unit/config_tests.rb
+- test/unit/context/setup_dsl_tests.rb
+- test/unit/context/subject_dsl_tests.rb
+- test/unit/context/suite_dsl_tests.rb
+- test/unit/context/test_dsl_tests.rb
 - test/unit/context_tests.rb
 - test/unit/macro_tests.rb
 - test/unit/result_tests.rb
@@ -139,6 +148,7 @@ test_files:
 - 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/unit/assert_tests.rb
@@ -154,10 +164,13 @@ test_files:
 - test/unit/assertions/assert_raises_tests.rb
 - test/unit/assertions/assert_respond_to_tests.rb
 - test/unit/assertions/assert_same_tests.rb
+- test/unit/assertions/assert_true_false_tests.rb
 - test/unit/assertions_tests.rb
-- test/unit/context/basic_singleton_tests.rb
-- test/unit/context/setup_teardown_singleton_tests.rb
-- test/unit/context/test_should_singleton_tests.rb
+- test/unit/config_tests.rb
+- test/unit/context/setup_dsl_tests.rb
+- test/unit/context/subject_dsl_tests.rb
+- test/unit/context/suite_dsl_tests.rb
+- test/unit/context/test_dsl_tests.rb
 - test/unit/context_tests.rb
 - test/unit/macro_tests.rb
 - test/unit/result_tests.rb

data/test/unit/context/basic_singleton_tests.rb

@@ -1,86 +0,0 @@
-require 'assert'
-require 'assert/context'
-
-class Assert::Context
-
-  # `ContextSingletonTests` defined in `test/helper.rb`
-  class BasicSingletonTests < ContextSingletonTests
-    should have_instance_methods :setup_once, :before_once, :startup
-    should have_instance_methods :teardown_once, :after_once, :shutdown
-    should have_instance_methods :setup, :before, :setups
-    should have_instance_methods :teardown, :after, :teardowns
-    should have_instance_methods :description, :desc, :describe, :subject
-    should have_instance_methods :test, :test_eventually, :test_skip
-    should have_instance_methods :should, :should_eventually, :should_skip
-
-  end
-
-  class DescriptionsTests < BasicSingletonTests
-    desc "`descriptions` method"
-    setup do
-      descs = @descs = [ "something amazing", "it really is" ]
-      @context_class = Factory.context_class do
-        descs.each{ |text| desc text }
-      end
-    end
-
-    should "return a collection containing any descriptions defined on the class" do
-      context_descs = subject.send :descriptions
-      assert_equal @descs, context_descs
-    end
-
-  end
-
-  class DescriptionTests < BasicSingletonTests
-    desc "`description` method"
-    setup do
-      parent_text = @parent_desc = "parent description"
-      @parent_class = Factory.context_class do
-        desc parent_text
-      end
-      text = @desc = "and the description for this context"
-      @context_class = Factory.context_class(@parent_class) do
-        desc text
-      end
-    end
-
-    should "return a string of all the inherited descriptions" do
-      exp_desc = "parent description and the description for this context"
-      assert_equal exp_desc, @context_class.description
-    end
-
-  end
-
-  class SubjectFromLocalTests < BasicSingletonTests
-    desc "subject method using local context"
-    setup do
-      subject_block = @subject_block = ::Proc.new{ @something }
-      @context_class = Factory.context_class do
-        subject(&subject_block)
-      end
-    end
-    subject{ @subject_block }
-
-    should "set the subject block on the context class" do
-      assert_equal @context_class.subject, subject
-    end
-
-  end
-
-  class SubjectFromParentTests < BasicSingletonTests
-    desc "subject method using parent context"
-    setup do
-      parent_block = @parent_block = ::Proc.new{ @something }
-      @parent_class = Factory.context_class do
-        subject(&parent_block)
-      end
-      @context_class = Factory.context_class(@parent_class)
-    end
-    subject{ @parent_block }
-
-    should "default to it's parents subject block" do
-      assert_equal @context_class.subject, subject
-    end
-  end
-
-end