assert 1.1.0 → 2.0.0.rc.1

data/test/suite_test.rb

@@ -22,7 +22,7 @@ class Assert::Suite
 
     should have_accessors :tests, :test_methods
     should have_accessors :start_time, :end_time
-    should have_instance_method  :run_time, :runner_seed
+    should have_instance_method  :run_time
 
     should "determine a klass' local public test methods" do
       assert_equal(

data/test/test_test.rb

@@ -191,24 +191,22 @@ class Assert::Test
         puts "std out from the test"
         assert true
       }
-      @orig_capture = @test.class.options.capture_output
-      @test.class.options.capture_output(true)
-      @test.run
+      @orig_show = Assert.config.show_output
+      Assert.config.show_output false
     }
     teardown {
-      @test.class.options.capture_output(@orig_capture)
+      Assert.config.show_output @orig_show
     }
 
     should "capture any io from the test" do
+      @test.run
       assert_equal "std out from the test\n", @test.output
     end
 
   end
 
-
-
-  class FullOutputCaptureTest < BasicTest
-    desc "when collecting std out across setup, teardown, and meth calls"
+  class FullCaptureOutTest < CaptureOutTest
+    desc "across setup, teardown, and meth calls"
     setup do
       @test = Factory.test("fullstdouttest") {
         puts "std out from the test"
@@ -220,16 +218,11 @@ class Assert::Test
         puts "std out from a method an assert called"
         true
       end
-
-      @orig_capture = @test.class.options.capture_output
-      @test.class.options.capture_output(true)
-      @test.run
     end
-    teardown {
-      @test.class.options.capture_output(@orig_capture)
-    }
 
     should "collect it on itself in the output accessor" do
+      @test.run
+
       assert_equal([
         "std out from the setup",
         "std out from the test",

data/test/view/base_tests.rb

@@ -9,29 +9,32 @@ module Assert::View
   class BaseTests < Assert::Context
     desc "the base view"
     setup do
-      @view = Assert::View::Base.new(Assert::Suite.new, StringIO.new("", "w+"))
+      @view = Assert::View::Base.new(StringIO.new("", "w+"), Assert::Suite.new)
     end
     subject{ @view }
 
-    # options
-    should have_instance_method :options
-    should have_class_method :options
-
     # accessors, base methods
-    should have_accessors :suite, :output_io
-    should have_instance_methods :view, :fire
-    should have_instance_methods :before_load, :after_load, :on_start, :on_finish
-    should have_instance_methods :before_test, :after_test, :on_result
+    should have_imeths :view, :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_instance_methods :run_time, :runner_seed, :count, :tests?, :all_pass?
-    should have_instance_methods :suite_contexts, :ordered_suite_contexts
-    should have_instance_methods :suite_files, :ordered_suite_files
-    should have_instance_methods :result_details_for, :show_result_details?
-    should have_instance_methods :ocurring_result_types, :result_summary_msg
-    should have_instance_methods :all_pass_result_summary_msg, :results_summary_sentence
-    should have_instance_methods :test_count_statement, :result_count_statement
-    should have_instance_methods :to_sentence
+    should have_imeths :run_time, :runner_seed, :count, :tests?, :all_pass?
+    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?
+    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 "default its result abbreviations" do
+      assert_equal '.', subject.pass_abbrev
+      assert_equal 'F', subject.fail_abbrev
+      assert_equal 'I', subject.ignore_abbrev
+      assert_equal 'S', subject.skip_abbrev
+      assert_equal 'E', subject.error_abbrev
+    end
 
   end
 
@@ -42,24 +45,4 @@ module Assert::View
     should have_instance_method :require_user_view
   end
 
-  class BaseOptionsTestx < Assert::Context
-    desc "options for the base view"
-    subject do
-      Assert::View::Base.options
-    end
-
-    should "be an Options::Base object" do
-      assert_kind_of Assert::Options::Base, subject
-    end
-
-    should "default its result abbreviations" do
-      assert_equal '.', subject.default_pass_abbrev
-      assert_equal 'F', subject.default_fail_abbrev
-      assert_equal 'I', subject.default_ignore_abbrev
-      assert_equal 'S', subject.default_skip_abbrev
-      assert_equal 'E', subject.default_error_abbrev
-    end
-
-  end
-
 end

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: assert
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: 
+  hash: -2762361102
+  prerelease: 6
   segments: 
-  - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  - 0
+  - rc
+  - 1
+  version: 2.0.0.rc.1
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-02-13 00:00:00 Z
+date: 2013-02-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ansi
@@ -44,6 +46,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- .assert.rb
 - .gitignore
 - CHANGELOG.md
 - Gemfile
@@ -53,34 +56,21 @@ files:
 - assert.gemspec
 - bin/assert
 - lib/assert.rb
+- lib/assert/assert_runner.rb
 - lib/assert/assertions.rb
-- lib/assert/autorun.rb
 - lib/assert/cli.rb
 - lib/assert/context.rb
 - lib/assert/macro.rb
 - lib/assert/macros/methods.rb
-- lib/assert/options.rb
-- lib/assert/rake_tasks.rb
-- lib/assert/rake_tasks/irb.rb
-- lib/assert/rake_tasks/scope.rb
-- lib/assert/rake_tasks/test_task.rb
 - lib/assert/result.rb
-- lib/assert/result_set.rb
 - lib/assert/runner.rb
-- lib/assert/setup.rb
-- lib/assert/setup/all.rb
-- lib/assert/setup/helpers.rb
-- lib/assert/setup/options.rb
-- lib/assert/setup/runner.rb
-- lib/assert/setup/suite.rb
-- lib/assert/setup/view.rb
 - lib/assert/suite.rb
 - lib/assert/test.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/capture_output.rb
 - lib/assert/view/helpers/common.rb
 - test/assert_test.rb
 - test/assertions/assert_block_test.rb
@@ -110,7 +100,6 @@ files:
 - test/assertions_test.rb
 - test/context/class_methods_test.rb
 - test/context_test.rb
-- test/default_view_test.rb
 - test/fixtures/inherited_stuff.rb
 - test/fixtures/sample_context.rb
 - test/fixtures/test_root/one_test.rb
@@ -120,13 +109,7 @@ files:
 - test/fixtures/test_root/shallow_test.rb
 - test/fixtures/test_root/two_test.rb
 - test/helper.rb
-- test/irb.rb
 - test/macro_test.rb
-- test/options_test.rb
-- test/rake_tasks/irb_test.rb
-- test/rake_tasks/scope_test.rb
-- test/rake_tasks/test_task_test.rb
-- test/result_set_test.rb
 - test/result_test.rb
 - test/runner_test.rb
 - test/suite/context_info_test.rb
@@ -154,12 +137,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
@@ -196,7 +181,6 @@ test_files:
 - test/assertions_test.rb
 - test/context/class_methods_test.rb
 - test/context_test.rb
-- test/default_view_test.rb
 - test/fixtures/inherited_stuff.rb
 - test/fixtures/sample_context.rb
 - test/fixtures/test_root/one_test.rb
@@ -206,13 +190,7 @@ test_files:
 - test/fixtures/test_root/shallow_test.rb
 - test/fixtures/test_root/two_test.rb
 - test/helper.rb
-- test/irb.rb
 - test/macro_test.rb
-- test/options_test.rb
-- test/rake_tasks/irb_test.rb
-- test/rake_tasks/scope_test.rb
-- test/rake_tasks/test_task_test.rb
-- test/result_set_test.rb
 - test/result_test.rb
 - test/runner_test.rb
 - test/suite/context_info_test.rb

data/lib/assert/autorun.rb

@@ -1,37 +0,0 @@
-require 'assert/setup/all'
-
-module Assert
-
-  # a flag to know if at_exit hook has been installed already
-  @@at_exit_installed ||= false
-
-  # install at_exit hook (if needed) (runs at process exit)
-  # this ensures the test suite won't run until all test files are loaded
-  # (this is essentially a direct rip from Minitest)
-
-  def self.autorun
-    if !@@at_exit_installed
-      self.view.fire(:before_load)
-
-      at_exit do
-        # don't run if there was an exception
-        next if $!
-
-        # the order here is important. The at_exit handler must be
-        # installed before anyone else gets a chance to install their
-        # own, that way we can be assured that our exit will be last
-        # to run (at_exit stacks).
-
-        exit_code = nil
-        at_exit { exit(false) if exit_code && exit_code != 0 }
-
-        self.view.fire(:after_load)
-        self.runner.new(self.suite, self.view).run
-      end
-
-      @@at_exit_installed = true
-    end
-  end
-
-end
-

data/lib/assert/options.rb

@@ -1,43 +0,0 @@
-module Assert
-  module Options
-
-    class Base
-      def method_missing(method, *args, &block)
-        if args.empty?
-          self.instance_variable_get("@#{method}")
-        else
-          value = args.size == 1 ? args.first : args
-          self.instance_variable_set("@#{method}", value)
-          if method.to_s =~ /^default_/
-            self.instance_variable_set("@#{$'}", value)
-          end
-        end
-      end
-
-    end
-
-    def self.included(receiver)
-      receiver.send(:class_variable_set, "@@options", Base.new)
-      receiver.send(:extend, ClassMethods)
-      receiver.send(:include, InstanceMethods)
-    end
-
-    module ClassMethods
-      def options(&block)
-        options = self.send(:class_variable_get, "@@options")
-        if block_given?
-          options.instance_eval(&block)
-        else
-          options
-        end
-      end
-    end
-
-    module InstanceMethods
-      def options
-        self.class.options
-      end
-    end
-
-  end
-end

data/lib/assert/rake_tasks.rb

@@ -1,75 +0,0 @@
-require 'rake'
-
-module Assert; end
-module Assert::RakeTasks; end
-
-require 'assert/rake_tasks/irb'
-require 'assert/rake_tasks/scope'
-require 'assert/rake_tasks/test_task'
-
-module Assert::RakeTasks
-
-  # Setup the rake tasks for testing
-  # * add 'include Assert::RakeTasks' to your Rakefile
-  def self.included(receiver)
-    # auto-install rake tasks
-    self.install
-  end
-
-  def self.install
-    warn "[DEPRECATED] `Assert::RakeTasts` has been deprecated.  Support for running tests with Rake will be removed in v2.0.  Use the assert CLI instead."
-
-    assert_test_root = ENV['ASSERT_TEST_ROOT'] || './test'
-
-    if File.exists?(assert_test_root)
-      self.irb_task(Assert::RakeTasks::Irb.new(assert_test_root))
-      self.to_tasks(Assert::RakeTasks::Scope.new(assert_test_root))
-    end
-  end
-
-  def self.for(test_root_name)
-    warn "[DEPRECATED] `Assert::RakeTasts.for` has been deprecated.  Use `Assert::RakeTasks.install` instead."
-  end
-
-  class << self
-    include Rake::DSL if defined? Rake::DSL
-
-    def irb_task(irb)
-      if irb.helper_exists?
-        desc irb.description
-        task irb.class.task_name do
-          sh irb.cmd
-        end
-      end
-    end
-
-    def to_tasks(scope)
-      # if there is a test task for the scope
-      if (scope_tt = scope.to_test_task)
-        # create a rake task to run it
-        desc scope_tt.description
-        task scope_tt.name do
-          RakeFileUtils.verbose(scope_tt.show_loaded_files?) { ruby scope_tt.ruby_args }
-        end
-      end
-
-      # create a namespace for the scope
-      namespace scope.namespace do
-        # for each test task in the scope, create a rake task to run it
-        scope.test_tasks.each do |test_file_tt|
-          desc test_file_tt.description
-          task test_file_tt.name do
-            RakeFileUtils.verbose(test_file_tt.show_loaded_files?) { ruby test_file_tt.ruby_args }
-          end
-        end
-
-        # recusively generate rake tasks for each sub-scope in the scope
-        scope.scopes.each do |sub_scope|
-          self.to_tasks(sub_scope)
-        end
-      end
-
-    end
-  end
-
-end

data/lib/assert/rake_tasks/irb.rb

@@ -1,33 +0,0 @@
-module Assert::RakeTasks
-  class Irb
-
-    def self.file_name
-      "irb.rb"
-    end
-
-    def self.task_name
-      :irb
-    end
-
-    def initialize(test_root)
-      @test_root = test_root
-    end
-
-    def file_path
-      File.join(@test_root.to_s, self.class.file_name)
-    end
-
-    def helper_exists?
-      File.exists?(self.file_path)
-    end
-
-    def description
-      "Open irb preloaded with #{self.file_path}"
-    end
-
-    def cmd
-      "irb -rubygems -r #{self.file_path}"
-    end
-
-  end
-end