ZenTest 3.7.2 → 3.8.0

data/lib/autotest/rails.rb

@@ -4,54 +4,62 @@ class Autotest::Rails < Autotest
 
   def initialize # :nodoc:
     super
-    @exceptions = /^\.\/(?:db|doc|log|public|script|tmp|vendor\/rails)/
 
-    @test_mappings = {
-      %r%^test/fixtures/(.*)s.yml% => proc { |_, m|
-        ["test/unit/#{m[1]}_test.rb",
-         "test/controllers/#{m[1]}_controller_test.rb",
-         "test/views/#{m[1]}_view_test.rb",
-         "test/functional/#{m[1]}_controller_test.rb"]
-      },
-      %r%^test/(unit|integration|controllers|views|functional)/.*rb$% => proc { |filename, _|
-        filename
-      },
-      %r%^app/models/(.*)\.rb$% => proc { |_, m|
-        ["test/unit/#{m[1]}_test.rb"]
-      },
-      %r%^app/helpers/application_helper.rb% => proc {
+    add_exception %r%^\./(?:db|doc|log|public|script|tmp|vendor)%
+
+    add_mapping %r%^test/fixtures/(.*)s.yml% do |_, m|
+      ["test/unit/#{m[1]}_test.rb",
+       "test/controllers/#{m[1]}_controller_test.rb",
+       "test/views/#{m[1]}_view_test.rb",
+       "test/functional/#{m[1]}_controller_test.rb"]
+    end
+
+    add_mapping %r%^test/(unit|integration|controllers|views|functional)/.*rb$% do |filename, _|
+      filename
+    end
+
+    add_mapping %r%^app/models/(.*)\.rb$% do |_, m|
+      "test/unit/#{m[1]}_test.rb"
+    end
+
+    add_mapping %r%^app/helpers/application_helper.rb% do
+      files_matching %r%^test/(views|functional)/.*_test\.rb$%
+    end
+
+    add_mapping %r%^app/helpers/(.*)_helper.rb% do |_, m|
+      if m[1] == "application" then
         files_matching %r%^test/(views|functional)/.*_test\.rb$%
-      },
-      %r%^app/helpers/(.*)_helper.rb% => proc { |_, m|
-        if m[1] == "application" then
-          files_matching %r%^test/(views|functional)/.*_test\.rb$%
-        else
-          ["test/views/#{m[1]}_view_test.rb",
-           "test/functional/#{m[1]}_controller_test.rb"]
-        end
-      },
-      %r%^app/views/(.*)/% => proc { |_, m|
+      else
         ["test/views/#{m[1]}_view_test.rb",
          "test/functional/#{m[1]}_controller_test.rb"]
-      },
-      %r%^app/controllers/(.*)\.rb$% => proc { |_, m|
-        if m[1] == "application" then
-          files_matching %r%^test/(controllers|views|functional)/.*_test\.rb$%
-        else
-          ["test/controllers/#{m[1]}_test.rb",
-           "test/functional/#{m[1]}_test.rb"]
-        end
-      },
-      %r%^app/views/layouts/% => proc {
-        "test/views/layouts_view_test.rb"
-      },
-      %r%^config/routes.rb$% => proc { # FIX:
+      end
+    end
+
+    add_mapping %r%^app/views/(.*)/% do |_, m|
+      ["test/views/#{m[1]}_view_test.rb",
+       "test/functional/#{m[1]}_controller_test.rb"]
+    end
+
+    add_mapping %r%^app/controllers/(.*)\.rb$% do |_, m|
+      if m[1] == "application" then
         files_matching %r%^test/(controllers|views|functional)/.*_test\.rb$%
-      },
-      %r%^test/test_helper.rb|config/((boot|environment(s/test)?).rb|database.yml)% => proc {
-        files_matching %r%^test/(unit|controllers|views|functional)/.*_test\.rb$%
-      },
-    }
+      else
+        ["test/controllers/#{m[1]}_test.rb",
+         "test/functional/#{m[1]}_test.rb"]
+      end
+    end
+
+    add_mapping %r%^app/views/layouts/% do
+      "test/views/layouts_view_test.rb"
+    end
+
+    add_mapping %r%^config/routes.rb$% do # FIX:
+      files_matching %r%^test/(controllers|views|functional)/.*_test\.rb$%
+    end
+
+    add_mapping %r%^test/test_helper.rb|config/((boot|environment(s/test)?).rb|database.yml)% do
+      files_matching %r%^test/(unit|controllers|views|functional)/.*_test\.rb$%
+    end
   end
 
   # Given the string filename as the path, determine

data/lib/zentest.rb

@@ -56,7 +56,7 @@ end
 
 class ZenTest
 
-  VERSION = '3.7.2'
+  VERSION = '3.8.0'
 
   include ZenTestMapping
 

data/test/test_autotest.rb

@@ -18,6 +18,8 @@ require 'autotest'
 #   run_tests
 
 class Autotest
+  attr_reader :test_mappings, :exception_list
+
   def self.clear_hooks
     HOOKS.clear
   end
@@ -46,6 +48,45 @@ class TestAutotest < Test::Unit::TestCase
     @a.last_mtime = Time.at(2)
   end
 
+  def test_add_exception
+    current = util_exceptions
+    @a.add_exception 'blah'
+
+    actual = util_exceptions
+    expect = current + ["blah"]
+
+    assert_equal expect, actual
+  end
+
+  def test_add_mapping
+    current = util_mappings
+    @a.add_mapping(/blah/) do 42 end
+
+    actual = util_mappings
+    expect = current + [/blah/]
+
+    assert_equal expect, actual
+  end
+
+  def test_clear_exceptions
+    test_add_exception
+    @a.clear_exceptions
+
+    actual = util_exceptions
+    expect = []
+
+    assert_equal expect, actual
+  end
+
+  def test_clear_mapping
+    @a.clear_mappings
+
+    actual = util_mappings
+    expect = []
+
+    assert_equal expect, actual
+  end
+
   def test_consolidate_failures_experiment
     @a.files.clear
     @a.files[@impl] = Time.at(1)
@@ -72,14 +113,6 @@ class TestAutotest < Test::Unit::TestCase
     assert_equal expected, @a.output.string
   end
 
-  def test_consolidate_failures_no_match
-    result = @a.consolidate_failures([['test_blah1', @test_class], ['test_blah2', @test_class], ['test_blah1', 'TestUnknown']])
-    expected = {@test => ['test_blah1', 'test_blah2']}
-    assert_equal expected, result
-    expected = "Unable to map class TestUnknown to a file\n"
-    assert_equal expected, @a.output.string
-  end
-
   def test_consolidate_failures_nested_classes
     @a.files.clear
     @a.files['lib/outer.rb'] = Time.at(5)
@@ -93,14 +126,32 @@ class TestAutotest < Test::Unit::TestCase
     assert_equal expected, @a.output.string
   end
 
+  def test_consolidate_failures_no_match
+    result = @a.consolidate_failures([['test_blah1', @test_class], ['test_blah2', @test_class], ['test_blah1', 'TestUnknown']])
+    expected = {@test => ['test_blah1', 'test_blah2']}
+    assert_equal expected, result
+    expected = "Unable to map class TestUnknown to a file\n"
+    assert_equal expected, @a.output.string
+  end
+
   def test_consolidate_failures_red
     result = @a.consolidate_failures([['test_blah1', @test_class], ['test_blah2', @test_class]])
     expected = {@test => ['test_blah1', 'test_blah2']}
     assert_equal expected, result
   end
 
-  # TODO: lots of filename edgecases for find_files_to_test
+  def test_exceptions
+    @a.clear_exceptions
+    test_add_exception
+    assert_equal(/blah/, @a.exceptions)
+  end
+
+  def test_exceptions_nil
+    @a.clear_exceptions
+    assert_nil @a.exceptions
+  end
 
+  # TODO: lots of filename edgecases for find_files_to_test
   def test_find_files_to_test
     @a.last_mtime = Time.at(0)
     assert @a.find_files_to_test(@a.files)
@@ -261,10 +312,6 @@ test_error2(#{@test_class}):
     assert_equal expected, result
   end
 
-  def util_path_to_classname(e,i)
-    assert_equal e, @a.path_to_classname(i)
-  end
-
   def test_path_to_classname
     # non-rails
     util_path_to_classname 'TestBlah', 'test/test_blah.rb'
@@ -272,6 +319,27 @@ test_error2(#{@test_class}):
     util_path_to_classname 'TestRuby2Ruby', 'test/test_ruby2ruby.rb'
   end
 
+  def test_remove_exception
+    test_add_exception
+    current = util_exceptions
+    @a.remove_exception 'blah'
+
+    actual = util_exceptions
+    expect = current - ["blah"]
+
+    assert_equal expect, actual
+  end
+
+  def test_remove_mapping
+    current = util_mappings
+    @a.remove_mapping(/^lib\/.*\.rb$/)
+
+    actual = util_mappings
+    expect = current - [/^lib\/.*\.rb$/]
+
+    assert_equal expect, actual
+  end
+
   def test_tests_for_file
     assert_equal [@test], @a.tests_for_file(@impl)
     assert_equal [@test], @a.tests_for_file(@test)
@@ -282,6 +350,10 @@ test_error2(#{@test_class}):
     assert_equal [], @a.tests_for_file('test_unknown.rb')
   end
 
+  def util_exceptions
+    @a.exception_list.sort_by { |r| r.to_s }
+  end
+
   def util_find_files_to_test(f, expected)
     t = @a.last_mtime + 1
     files = { f => t }
@@ -291,4 +363,12 @@ test_error2(#{@test_class}):
     assert_equal t, @a.files[f]
     assert_equal "", @a.output.string
   end
+
+  def util_mappings
+    @a.test_mappings.keys.sort_by { |x| x.to_s }
+  end
+
+  def util_path_to_classname(e,i)
+    assert_equal e, @a.path_to_classname(i)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ZenTest
 version: !ruby/object:Gem::Version 
-  version: 3.7.2
+  version: 3.8.0
 platform: ruby
 authors: 
 - Ryan Davis
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-09 00:00:00 -08:00
+date: 2008-01-14 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,16 +34,18 @@ extensions: []
 
 extra_rdoc_files: 
 - History.txt
-- LinuxJournalArticle.txt
 - Manifest.txt
 - README.txt
+- articles/how_to_use_zentest.txt
 - example.txt
 files: 
 - History.txt
-- LinuxJournalArticle.txt
 - Manifest.txt
 - README.txt
 - Rakefile
+- articles/Article.css
+- articles/getting_started_with_autotest.html
+- articles/how_to_use_zentest.txt
 - bin/autotest
 - bin/multiruby
 - bin/rails_test_audit