ZenTest 3.6.0 → 3.6.1

data/History.txt

@@ -1,3 +1,14 @@
+=== 3.6.1 / 2007-07-23
+
+* 4 minor enhancements:
+  * Test::Rails::ViewTestCase now uses assert_select.
+    * assert_form and friends now work with blocks like assert_select
+      does.
+  * Allow path_parameters in view tests to be ammended, making working
+    with routes easier.
+  * New version of autotest/notify.rb uses notify-send.
+  * Fixed rdoc formatting on autotest and a couple plugins.
+
 === 3.6.0 / 2007-05-25
 
 * 4 major enhancements:

data/lib/autotest.rb

@@ -48,12 +48,12 @@ $TESTING = false unless defined? $TESTING
 #
 # Strategy:
 #
-# 1) find all files and associate them from impl <-> test
-# 2) run all tests
-# 3) scan for failures
-# 4) detect changes in ANY (ruby?) file, rerun all failures + changed files
-# 5) until 0 defects, goto 3
-# 6) when 0 defects, goto 2
+# 1. Find all files and associate them from impl <-> test.
+# 2. Run all tests.
+# 3. Scan for failures.
+# 4. Detect changes in ANY (ruby?. file, rerun all failures + changed files.
+# 5. Until 0 defects, goto 3.
+# 6. When 0 defects, goto 2.
 
 class Autotest
 

data/lib/autotest/notify.rb

@@ -1,38 +1,34 @@
-# libnotify plugin for autotest
-
-begin require 'rubygems'; rescue LoadError; end
-require 'libnotify'
-
-module Autotest::LibNotify
-
-  LibNotify.init("autotest")
-
-  def self.notify title, msg, ico = :info
-    LibNotify::Notification.new(title, msg, "gtk-#{ico}", nil).show
+module Autotest::Notify
+  def self.notify(title, message, priority='critical')
+    icon = if priority == 'critical'
+      'dialog-error'
+    else
+      'dialog-information'
+    end
+    system "notify-send -u #{priority} -t 10000 -i #{icon} '#{title}' '#{message.inspect}'"
   end
 
   Autotest.add_hook :red do |at|
-    failed_tests = at.files_to_test.inject(0){ |s,a| k,v = a;  s + v.size}
-    notify "Tests Failed", "#{failed_tests} tests failed", :no
+    tests = 0
+    assertions = 0
+    failures = 0
+    errors = 0
+    at.results.scan(/(\d+) tests, (\d+) assertions, (\d+) failures, (\d+) errors/) do |t, a, f, e|
+      tests += t.to_i
+      assertions += a.to_i
+      failures += f.to_i
+      errors += e.to_i
+    end
+    message = "%d tests, %d assertions, %d failures, %d errors" % 
+      [tests, assertions, failures, errors]
+    notify("Tests Failed", message)
   end
 
   Autotest.add_hook :green do |at|
-    notify "Tests Passed", "All tests passed", :yes
-  end
-
-  Autotest.add_hook :run do |at|
-    notify "autotest", "autotest was started" unless $TESTING
-  end
-
-  Autotest.add_hook :interrupt do |at|
-    notify "autotest", "autotest was reset" unless $TESTING
-  end
-
-  Autotest.add_hook :quit do |at|
-    notify "autotest", "autotest is exiting" unless $TESTING
+    notify("Tests Passed", "Outstanding tests passed", 'low') if at.tainted
   end
 
   Autotest.add_hook :all do |at|_hook
-    notify "autotest", "Tests have fully passed", :yes unless $TESTING
+    notify("autotest", "Tests have fully passed", 'low')
   end
 end

data/lib/autotest/screen.rb

@@ -1,15 +1,16 @@
-class Autotest::Screen
-  # Autotest::Screen is test result notify GUN Screen's statusline.
-  #
-  # === screenshots
-  # * <img src="http://f.hatena.ne.jp/images/fotolife/s/secondlife/20061109/20061109015543.png" />
-  # * <img src="http://f.hatena.ne.jp/images/fotolife/s/secondlife/20061109/20061109015522.png" />
-  #
-  # == SYNOPSIS
-  #   require 'autotest/screen'
-  #   # Autotest::Screen.statusline = '%H %`%-w%{=b bw}%n %t%{-}%+w (your statusline)'
-  #
+##
+# Autotest::Screen is test result notify GUN Screen's statusline.
+#
+# === screenshots
+# * <img src="http://f.hatena.ne.jp/images/fotolife/s/secondlife/20061109/20061109015543.png" />
+# * <img src="http://f.hatena.ne.jp/images/fotolife/s/secondlife/20061109/20061109015522.png" />
+#
+# == SYNOPSIS
+#   require 'autotest/screen'
+#   # Autotest::Screen.statusline = '%H %`%-w%{=b bw}%n %t%{-}%+w (your statusline)'
+#
 
+class Autotest::Screen
   DEFAULT_STATUSLINE = '%H %`%-w%{=b bw}%n %t%{-}%+w'
   DEFAULT_SCREEN_CMD = 'screen'
 

data/lib/test/rails.rb

@@ -247,7 +247,7 @@ $TESTING = true
 # The test target no longer runs all tests, it stops on the first
 # failure. This way a failure in a unit test doesn't fill your screen
 # with less important errors because the underlying failure also
-# affected your controllers and views. 
+# affected your controllers and views.
 #
 # The stats target is updated to account for controller and view tests.
 

data/lib/test/rails/functional_test_case.rb

@@ -1,4 +1,4 @@
-$TESTING_RTC = defined? $TESTING_RTC
+$TESTING_RTC = defined?($TESTING_RTC) && $TESTING_RTC
 
 ##
 # FunctionalTestCase is an abstract class that sets up a controller instance

data/lib/test/rails/view_test_case.rb

@@ -11,18 +11,18 @@
 #
 # = Naming
 #
-# The test class must be named after your controller class name, so if
-# you're testing views for the +RouteController+ you would name your
-# test case +RouteViewTest+. The test case will expect to find your
-# view files in <tt>app/views/route</tt>.
+# The test class must be named after your controller class name, so if you're
+# testing views for the +RouteController+ you would name your test case
+# +RouteViewTest+. The test case will expect to find your view files in
+# <tt>app/views/route</tt>.
 #
-# The test names should be in the form of +test_view_edgecase+ where
-# 'view' corresponds to the name of the view file, and 'edgecase'
-# describes the scenario you are testing.
+# The test names should be in the form of +test_view_edgecase+ where 'view'
+# corresponds to the name of the view file, and 'edgecase' describes the
+# scenario you are testing.
 #
-# If you are testing a view file named 'show.rhtml' your test should
-# be named +test_show+. If your view is behaves differently depending
-# upon its parameters then you can make the test name descriptive like
+# If you are testing a view file named 'show.rhtml' your test should be named
+# +test_show+. If your view is behaves differently depending upon its
+# parameters then you can make the test name descriptive like
 # +test_show_photos+ and +test_show_no_photos+.
 #
 # = Examples
@@ -42,12 +42,13 @@
 #       render
 #   
 #       # assert that there's a form with an action of "/route/destroy"
-#       form_url = '/route/destroy'
-#       assert_post_form form_url
-#       # with a hidden id field
-#       assert_input form_url, :hidden, :id
-#       # And a submit button that says 'Delete!'
-#       assert_submit form_url, 'Delete!'
+#       assert_form form_url, :post do
+#         # with a hidden id field
+#         assert_input :hidden, :id
+#         # And a submit button that says 'Delete!'
+#         assert_submit 'Delete!'
+#       end
+#   
 #       # And a link back to the route so you don't delete it
 #       assert_links_to "/route/show/#{routes(:work).id}", 'No, I do not!'
 #     end
@@ -65,7 +66,7 @@
 #   class LayoutsViewTest < Test::Rails::ViewTestCase
 #   
 #     fixtures :users, :routes, :points, :photos
-#     
+#   
 #     def test_default
 #       # Template set-up
 #       @request.request_uri = '/foo'
@@ -77,12 +78,20 @@
 #       # Assert content just like a regular view test.
 #       assert_links_to '/', 'Home'
 #       assert_links_to '/user', 'Login'
-#       deny_links_to   '/user/logout', 'Logout'
-#       assert_tag :tag => 'title', :content => 'Hello &amp; Goodbye'
-#       assert_tag :tag => 'h1', :content => 'Hello &amp; Goodbye'
+#       deny_links_to '/user/logout', 'Logout'
+#       assert_title 'Hello &amp; Goodbye'
+#       assert_h 1, 'Hello &amp; Goodbye'
 #     end
-#     
+#   
 #   end
+#
+# = Deprecated Features
+#
+# Form assertions are now using assert_select, so you don't need to pass URLs
+# around everywhere and can instead use a block.  (See above example).
+#
+# The form assertions will still work using the old syntax, but in a future
+# release they will give warnings, then will be removed.
 
 class Test::Rails::ViewTestCase < Test::Rails::FunctionalTestCase
 
@@ -95,6 +104,8 @@ class Test::Rails::ViewTestCase < Test::Rails::FunctionalTestCase
   def setup
     return if self.class == Test::Rails::ViewTestCase
 
+    @path_parameters ||= {}
+
     klass_name = self.class.name.sub(/View/, 'Controller')
     @controller_class_name ||= klass_name.sub 'Test', ''
 
@@ -135,7 +146,37 @@ class Test::Rails::ViewTestCase < Test::Rails::FunctionalTestCase
   #
   #   render :template => 'profile/index'
   #
-  # For this test:
+  # A test's path parameters may be overridden, allowing routes with
+  # additional parameters to work.
+  #
+  # == Working with Routes
+  #
+  # By default, a view tests sets the controller and action of a test to the
+  # controller name and action name for the test.  This may be overriden.
+  #
+  # A test involving routes like:
+  #
+  #   map.workspace '/users/:owner/workspace/:action',
+  #                 :controller => 'workspace', :action => 'workspace'
+  #
+  # Can be invoked by setting @path_parameters like this:
+  #
+  #   def test__app_entry
+  #     @path_parameters[:owner] = 'bob'
+  #     @path_parameters[:action] = 'apps'
+  #   
+  #     render :partial => 'apps/app_entry'
+  #   
+  #     # ...
+  #   end
+  #
+  # == View Lookup
+  #
+  # render strips off words trailing an _ in the test name one at a time until
+  # it finds a matching action.  It tries the extensions 'rhtml', 'rxml',
+  # 'rjs', and 'mab' in order for each action until a view is found.
+  #
+  # With this test case:
   #
   #   class RouteViewTest < Test::Rails::ViewTestCase
   #     def test_show_photos
@@ -146,19 +187,20 @@ class Test::Rails::ViewTestCase < Test::Rails::FunctionalTestCase
   #     end
   #   end
   #
-  # For test_show_photos will look for:
+  # In test_show_photos, render will look for:
   # * app/views/route/show_photos.rhtml
   # * app/views/route/show_photos.rxml
-  # * app/views/route/show.rhtml
-  # * app/views/route/show.rxml
+  # * app/views/route/show_photos.rjs
+  # * app/views/route/show_photos.mab
+  # * app/views/route/show.[...]
   #
-  # And test_show_no_photos will look for:
+  # And in test_show_no_photos, render will look for:
   # * app/views/route/show_no_photos.rhtml
   # * app/views/route/show_no_photos.rxml
-  # * app/views/route/show_no.rhtml
-  # * app/views/route/show_no.rxml
-  # * app/views/route/show.rhtml
-  # * app/views/route/show.rxml
+  # * app/views/route/show_no_photos.rjs
+  # * app/views/route/show_no_photos.mab
+  # * app/views/route/show_no.[...]
+  # * app/views/route/show.[...]
   #
   # If a view cannot be found the test will flunk.
 
@@ -166,11 +208,15 @@ class Test::Rails::ViewTestCase < Test::Rails::FunctionalTestCase
     @action_name = action_name caller[0] if options.empty?
     assigns[:action_name] = @action_name
 
-    @request.path_parameters = {
+    default_path_parameters = {
       :controller => @controller.controller_name,
-      :action => @action_name,
+      :action => @action_name
     }
 
+    path_parameters = default_path_parameters.merge(@path_parameters)
+
+    @request.path_parameters = path_parameters
+
     defaults = { :layout => false }
     options = defaults.merge options
 
@@ -203,16 +249,12 @@ class Test::Rails::ViewTestCase < Test::Rails::FunctionalTestCase
 
   def assert_error_on(field, type)
     error_message = ActiveRecord::Errors.default_error_messages[type]
-    assert_tag :tag => 'div', :attributes => { :class => 'errorExplanation' },
-                  :descendant => {
-                    :tag => 'li',
-                    :content => /^#{field} #{error_message}/i }
+    assert_select "div.errorExplanation li",
+                  :text => /^#{field} #{error_message}/i
   end
 
   ##
-  # Asserts that a form with +form_action+ has an input element of +type+ with
-  # a name of "+model+[+column+]" and has a label with a for attribute of
-  # "+model+_+column+".
+  # A wrapper assert that calls both assert_input and assert_label.
   #
   # view:
   #   <%= start_form_tag :controller => 'game', :action => 'save' %>
@@ -222,13 +264,46 @@ class Test::Rails::ViewTestCase < Test::Rails::FunctionalTestCase
   # test:
   #   assert_field '/game/save', :text, :game, :amount
 
-  def assert_field(form_action, type, model, column, value = nil)
-    assert_input form_action, type, "#{model}[#{column}]", value
-    assert_label form_action, "#{model}_#{column}", false
+  def assert_field(*args)
+    form_action, type, model, column, value =
+      Symbol === args.first ? [nil, *args] : args
+
+    if form_action then # HACK deprecate
+      assert_input form_action, type, "#{model}[#{column}]", value
+      assert_label form_action, "#{model}_#{column}"
+    else
+      assert_input type, "#{model}[#{column}]", value
+      assert_label "#{model}_#{column}"
+    end
+  end
+
+  ##
+  # Asserts that there is a form whose action is +form_action+.  Optionally,
+  # +method+ and +enctype+ may be specified.  If a block is given, assert_form
+  # behaves like assert_select, so assert_input and friends may be scoped to
+  # the selected form.
+  #
+  # view:
+  #   <%= start_form_tag :action => 'create_file' %>
+  #   # ...
+  #
+  # test:
+  #   assert_form '/game/save'
+  #
+  # or:
+  #   assert_form '/game/save' do
+  #     # ...
+  #   end
+
+  def assert_form(form_action, method = nil, enctype = nil, &block)
+    selector = "form[action='#{form_action}']"
+    selector << "[method='#{method}']" if method
+    selector << "[enctype='#{enctype}']" if enctype
+    assert_select selector, &block
   end
 
   ##
-  # Asserts a h tag of level +level+ exists and contains +content+.
+  # Asserts a hN tag of level +level+ exists and contains +content+.
   #
   # view:
   #   <h3>Recent Builds</h3>
@@ -237,7 +312,7 @@ class Test::Rails::ViewTestCase < Test::Rails::FunctionalTestCase
   #   assert_h 3, 'Recent Builds'
 
   def assert_h(level, content)
-    assert_tag :tag => "h#{level}", :content => content
+    assert_select "h#{level}", :text => content
   end
 
   ##
@@ -250,45 +325,52 @@ class Test::Rails::ViewTestCase < Test::Rails::FunctionalTestCase
   #   assert_image '/images/bucket.jpg'
 
   def assert_image(src)
-    assert_tag :tag => 'img', :attributes => { :src => src }
+    assert_select "img[src='#{src}']"
   end
 
   ##
-  # Asserts that a form with +form_action+ has an input element of +type+ with
-  # a name of +name+.
+  # Asserts that an input element of +type+ with a name of +name+, and
+  # optionally a value of +value+ exists.
   #
   # view:
-  #   <%= start_form_tag :controller => 'game', :action => 'save' %>
   #   <%= text_field 'game', 'amount' %>
   #
   # test:
-  #   assert_input '/game/save', :text, "game[amount]"
+  #   assert_input :text, "game[amount]"
+
+  def assert_input(*args)
+    action, type, name, value = Symbol === args.first ? [nil, *args] : args
+
+    raise ArgumentError, 'supply type and name' if type.nil? or name.nil?
 
-  def assert_input(form_action, type, name, value = nil)
-    attrs = { :type => type.to_s, :name => name.to_s }
-    attrs[:value] = value unless value.nil?
-    assert_tag_in_form form_action, :tag => 'input', :attributes => attrs
+    input_selector = "input[type='#{type}'][name='#{name}']"
+    input_selector << "[value='#{value}']" if value
+
+    assert_select_in_form action do assert_select input_selector end
   end
 
   ##
-  # Asserts that a form with +form_action+ has a label with a for attribute of
-  # "+model+_+column+".
+  # Asserts that a label with a for attribute of +for_attribute+ exists.
   #
   # view:
   #   <%= start_form_tag :controller => 'game', :action => 'save' %>
   #   <label for="game_amount">Amount:</label>
   #
   # test:
-  #   assert_label '/game/save', :game, :amount
+  #   assert_label 'game_amount'
+
+  def assert_label(*args)
+    action, for_attribute = args.length == 1 ? [nil, *args] : args
 
-  def assert_label(form_action, name, include_f = true)
-    for_attribute = (include_f ? 'f_' : '') << name
-    assert_tag_in_form form_action, :tag => 'label', :attributes => {
-                                      :for => for_attribute }
+    raise ArgumentError, 'supply for_attribute' if for_attribute.nil?
+
+    label_selector = "label[for='#{for_attribute}']"
+
+    assert_select_in_form action do assert_select label_selector end
   end
 
   ##
-  # Asserts that there is an anchor tag with an href of +href+ and optionally
+  # Asserts that there is an anchor tag with an href of +href+ that optionally
   # has +content+.
   #
   # view:
@@ -298,7 +380,7 @@ class Test::Rails::ViewTestCase < Test::Rails::FunctionalTestCase
   #   assert_links_to '/players/show/1', 'drbrain'
 
   def assert_links_to(href, content = nil)
-    assert_tag links_to_options_for(href, content)
+    assert_select(*links_to_options_for(href, content))
   end
 
   ##
@@ -312,12 +394,16 @@ class Test::Rails::ViewTestCase < Test::Rails::FunctionalTestCase
   #   deny_links_to '/players/show/1'
 
   def deny_links_to(href, content = nil)
-    assert_no_tag links_to_options_for(href, content)
+    selector, options = links_to_options_for(href, content)
+    options[:count] = 0
+
+    assert_select selector, options
   end
 
   ##
   # Asserts that there is a form using the 'POST' method whose action is
-  # +form_action+ and uses the multipart content type.
+  # +form_action+ and uses the multipart content type.  If passed a block,
+  # works like assert_form.
   #
   # view:
   #   <%= start_form_tag({ :action => 'create_file' }, :multipart => true) %>
@@ -325,14 +411,13 @@ class Test::Rails::ViewTestCase < Test::Rails::FunctionalTestCase
   # test:
   #   assert_multipart_form '/game/save'
 
-  def assert_multipart_form(form_action)
-    assert_tag :tag => 'form', :attributes => { :action => form_action,
-                 :method => 'post', :enctype => 'multipart/form-data' }
+  def assert_multipart_form(form_action, &block)
+    assert_form(form_action, :post, 'multipart/form-data', &block)
   end
 
   ##
   # Asserts that there is a form using the 'POST' method whose action is
-  # +form_action+.
+  # +form_action+.  If passed a block, works like assert_form.
   #
   # view:
   #   <%= start_form_tag :action => 'create_file' %>
@@ -340,57 +425,58 @@ class Test::Rails::ViewTestCase < Test::Rails::FunctionalTestCase
   # test:
   #   assert_post_form '/game/save'
 
-  def assert_post_form(form_action)
-    assert_tag :tag => 'form', :attributes => { :action => form_action,
-                 :method => 'post' }
+  def assert_post_form(form_action, &block)
+    assert_form(form_action, :post, &block)
   end
 
   ##
-  # Asserts that a form with +form_action+ has a select element with a name of
-  # "+model+[+column+]" and options with specified names and values.
+  # Asserts that a select element with a name of "+model+[+column+]" and
+  # +options+ with specified names and values exists.
   #
   # view:
-  #   <%= start_form_tag :action => 'save' %>
   #   <%= collection_select :game, :location_id, @locations, :id, :name %>
   #
   # test:
-  #   assert_select_tag '/games/save', :game, :location_id,
-  #                     'Ballet' => 1, 'Guaymas' => 2
+  #   assert_select_tag :game, :location_id, 'Ballet' => 1, 'Guaymas' => 2
+
+  def assert_select_tag(*args)
+    action, model, column, options = Symbol === args.first ? [nil, *args] : args
 
-  def assert_select_tag(form_action, model, column, options)
     assert_kind_of Hash, options, "options needs to be a Hash"
     deny options.empty?, "options must not be empty"
-    options.each do |option_name, option_id|
-      assert_tag_in_form(form_action,
-                         :tag => 'select',
-                         :attributes => { :name => "#{model}[#{column}]" },
-                         :child => {
-                           :tag => 'option',
-                           :attributes => { :value => option_id },
-                           :content => option_name
-                         })
+
+    select_selector = "select[name='#{model}[#{column}]']"
+
+    options.each do |option_name, option_value|
+      option_selector = "option[value='#{option_value}']"
+      selector = "#{select_selector} #{option_selector}"
+
+      assert_select_in_form action do
+        assert_select selector, :text => option_name
+      end
     end
   end
 
   ##
-  # Asserts that a form with +form_action+ has a submit element with a value
-  # of +value+.
+  # Asserts that a submit element with a value of +value+ exists.
   #
   # view:
-  #   <%= start_form_tag :action => 'save' %>
   #   <input type="submit" value="Create!" %>
   #
   # test:
-  #   assert_submit '/route/save', 'Create!'
+  #   assert_submit 'Create!'
+
+  def assert_submit(*args)
+    action, value = args.length == 1 ? [nil, *args] : args
 
-  def assert_submit(form_action, value)
-    assert_tag_in_form form_action, :tag => 'input', :attributes => {
-                                      :type => "submit", :value => value }
+    submit_selector = "input[type='submit'][value='#{value}']"
+
+    assert_select_in_form action do assert_select submit_selector end
   end
 
   ##
   # Asserts that a form with +form_action+ has a descendent that matches
-  # +options+.
+  # +options+ exists.
   #
   # Typically this is not used directly in tests. Instead use it to build
   # expressive tests that assert which fields are in what form.
@@ -408,14 +494,13 @@ class Test::Rails::ViewTestCase < Test::Rails::FunctionalTestCase
   end
 
   ##
-  # Asserts that a form with +form_action+ has a textarea with name +name+ and
-  # optionally +value?.
+  # Asserts that a textarea with name +name+ and optionally +value+ exists.
   #
   # view:
   #   <%= text_area 'post', 'body' %>
   #
   # test:
-  #   assert_text_area '/post/save', 'post[body]'
+  #   assert_text_area 'post[body]'
   #
   # view:
   #   <textarea id="post_body" name="post[body]">
@@ -423,17 +508,21 @@ class Test::Rails::ViewTestCase < Test::Rails::FunctionalTestCase
   #   </textarea>
   #
   # test:
-  #   assert_text_area '/post/save', 'post[body]', posts(:post).body
+  #   assert_text_area 'post[body]', posts(:post).body
 
-  def assert_text_area(form_action, name, value = nil)
-    attribs = {
-      :tag => 'textarea',
-      :attributes => { :name => name },
-    }
-    attribs[:content] = value if value
-    assert_tag_in_form form_action, attribs
+  def assert_text_area(*args)
+    action, name, value = args.first !~ /\A\// ? [nil, *args] : args
+
+    raise ArgumentError, 'supply name' if name.nil?
+
+    text_area_selector = ["textarea[name='#{name}']"]
+    text_area_selector << { :text => value } if value
+
+    assert_select_in_form action do assert_select(*text_area_selector) end
   end
 
+  alias assert_textarea assert_text_area
+
   ##
   # Asserts that a title with +title+ exists.
   #
@@ -442,11 +531,18 @@ class Test::Rails::ViewTestCase < Test::Rails::FunctionalTestCase
   #
   # test:
   #   assert_title 'some content'
-  
+
   def assert_title(title)
-    assert_tag :tag => 'title', :content => title
+    assert_select 'title', :text => title
+  end
+
+  ##
+  # Opposite of assert_select.
+
+  def deny_select(selector)
+    assert_select selector, false
   end
-  
+
   ##
   # Creates a new Paginator that uses the current controller. +item_count+,
   # +items_per_page+ and +page_number+ are passed straight through.
@@ -456,19 +552,27 @@ class Test::Rails::ViewTestCase < Test::Rails::FunctionalTestCase
                                                 items_per_page, page_number)
   end
 
-  protected
+  ##
+  # Utility method for compatibility with old-style assert_tag form
+  # assertions.
+
+  def assert_select_in_form(action, &block) # :nodoc:
+    if action then
+      assert_form(action, &block)
+    else
+      block.call
+    end
+  end
 
   ##
   # Creates an assertion options hash for +href+ and +content+.
 
   def links_to_options_for(href, content = nil)
-    options = { :tag => 'a', :attributes => { :href => href } }
-    options[:content] = content unless content.nil?
-    return options
+    selector = "a[href='#{href}']"
+    equality = content ? { :text => content } : {}
+    return selector, equality
   end
 
-  private
-
   ##
   # Returns the action_name based on a backtrace line passed in as +test+.
 

data/lib/zentest.rb

@@ -56,7 +56,7 @@ end
 
 class ZenTest
 
-  VERSION = '3.6.0'
+  VERSION = '3.6.1'
 
   include ZenTestMapping
 

data/test/test_rails_view_test_case.rb

@@ -3,59 +3,267 @@ require 'test/zentest_assertions'
 
 $TESTING_RTC = true
 
+module Rails
+  module VERSION
+    STRING = '99.99.99'
+  end
+end
+
 begin
   require 'test/rails'
 rescue LoadError, NameError
   $TESTING_RTC = false
 end
 
-class View; end
-
 class TestRailsViewTestCase < Test::Rails::ViewTestCase
 
   def setup
-    # override
-    @request = Object.new
-    def @request.body; @body; end
-    def @request.body=(body); @body = body; end
-
     @assert_tag = []
+    @assert_no_tag = []
+
+    @assert_select = []
   end
 
-  def test_assert_text_area
-    @request.body = '
-<form action="/post/save">
-<textarea id="post_body" name="post[body]">
-OMG he like hates me and he\'s like going out with this total skank!~ oh noes!!~
-</textarea>
-</form>
-'
+  def test_assert_field
+    assert_field :text, :game, :amount
 
-    assert_text_area '/post/save', 'post[body]'
+    assert_equal 2, @assert_select.length
+
+    expected = ["input[type='text'][name='game[amount]']"]
+
+    assert_equal expected, @assert_select.first
+
+    expected = ["label[for='game_amount']"]
+
+    assert_equal expected, @assert_select.last
+  end
+
+  def test_assert_field_form
+    assert_field '/game/save', :text, :game, :amount
+
+    assert_equal 4, @assert_select.length
+
+    assert_equal ["form[action='/game/save']"], @assert_select.shift
+    assert_equal ["input[type='text'][name='game[amount]']"],
+                 @assert_select.shift
+
+    assert_equal ["form[action='/game/save']"], @assert_select.shift
+    assert_equal ["label[for='game_amount']"], @assert_select.shift
+  end
+
+  def test_assert_form
+    assert_form '/game/save'
+
+    assert_equal 1, @assert_select.length
+    assert_equal ["form[action='/game/save']"], @assert_select.first
+  end
+
+  def test_assert_form_method
+    assert_form '/game/save', :post
+
+    assert_equal 1, @assert_select.length
+    assert_equal ["form[action='/game/save'][method='post']"],
+                 @assert_select.first
+  end
+
+  def test_assert_form_enctype
+    assert_form '/game/save', nil, 'multipart/form-data'
+
+    assert_equal 1, @assert_select.length
+    assert_equal ["form[action='/game/save'][enctype='multipart/form-data']"],
+                 @assert_select.first
+  end
+
+  def test_assert_h
+    assert_h 1, 'hi'
+
+    assert_equal [['h1', { :text => 'hi' }]], @assert_select
+  end
+
+  def test_assert_img
+    assert_image '/images/bucket.jpg'
+
+    assert_equal [["img[src='/images/bucket.jpg']"]], @assert_select
+  end
+
+  def test_assert_input
+    assert_input :text, 'game[amount]'
+
+    assert_equal 1, @assert_select.length
+    assert_equal ["input[type='text'][name='game[amount]']"],
+                 @assert_select.first
+  end
+
+  def test_assert_input_form
+    assert_input '/game/save', :text, 'game[amount]'
+
+    assert_equal 2, @assert_select.length
+    assert_equal ["form[action='/game/save']"], @assert_select.shift
+    assert_equal ["input[type='text'][name='game[amount]']"],
+                 @assert_select.shift
+  end
+
+  def test_assert_input_value
+    assert_input :text, 'game[amount]', 5
+
+    expected = ["input[type='text'][name='game[amount]'][value='5']"]
+
+    assert_equal 1, @assert_select.length
+    assert_equal expected, @assert_select.first
+  end
+
+  def test_assert_label
+    assert_label 'game_amount'
+
+    expected = ["label[for='game_amount']"]
+
+    assert_equal 1, @assert_select.length
+    assert_equal expected, @assert_select.first
+  end
+
+  def test_assert_label_form
+    assert_label '/game/save', 'game_amount'
+
+    assert_equal 2, @assert_select.length
+    assert_equal ["form[action='/game/save']"], @assert_select.shift
+    assert_equal ["label[for='game_amount']"], @assert_select.shift
+  end
+
+  def test_assert_links_to
+    assert_links_to '/game/show/1', 'hi'
+
+    expected = ["a[href='/game/show/1']", { :text => 'hi' }]
+
+
+    assert_equal 1, @assert_select.length
+    assert_equal expected, @assert_select.first
+  end
+
+  def test_assert_multipart_form
+    assert_multipart_form '/game/save'
+
+    expected = [
+      "form[action='/game/save'][method='post'][enctype='multipart/form-data']"
+    ]
+
+    assert_equal 1, @assert_select.length
+    assert_equal expected, @assert_select.first
+  end
+
+  def test_assert_post_form
+    assert_post_form '/game/save'
+
+    expected = ["form[action='/game/save'][method='post']"]
+
+    assert_equal 1, @assert_select.length
+    assert_equal expected, @assert_select.first
+  end
+
+  def test_assert_select_tag
+    assert_select_tag :game, :location_id,
+                      'Ballet' => 1, 'Guaymas' => 2
+
+    assert_equal 2, @assert_select.length
+
+    assert_equal ["select[name='game[location_id]'] option[value='2']",
+                  { :text => 'Guaymas' }], @assert_select.shift
+    assert_equal ["select[name='game[location_id]'] option[value='1']",
+                  { :text => 'Ballet' }], @assert_select.shift
+  end
+
+  def test_assert_select_tag_form
+    assert_select_tag '/game/save', :game, :location_id,
+                      'Ballet' => 1, 'Guaymas' => 2
+
+    assert_equal 4, @assert_select.length
+
+    assert_equal ["form[action='/game/save']"], @assert_select.shift
+    assert_equal ["select[name='game[location_id]'] option[value='2']",
+                  { :text => 'Guaymas' }], @assert_select.shift
+    assert_equal ["form[action='/game/save']"], @assert_select.shift
+    assert_equal ["select[name='game[location_id]'] option[value='1']",
+                  { :text => 'Ballet' }], @assert_select.shift
+  end
+
+  def test_assert_submit
+    assert_submit 'Save!'
+
+    assert_equal 1, @assert_select.length
+    assert_equal ["input[type='submit'][value='Save!']"], @assert_select.first
+  end
+
+  def test_assert_submit_form
+    assert_submit '/game/save', 'Save!'
+
+    assert_equal 2, @assert_select.length
+    assert_equal ["form[action='/game/save']"], @assert_select.shift
+    assert_equal ["input[type='submit'][value='Save!']"], @assert_select.shift
+  end
+
+  def test_assert_tag_in_form
+    assert_tag_in_form '/game/save', :tag => 'input'
 
     expected = {
-      :tag => 'form', :attributes => { :action => '/post/save' },
-        :descendant => {
-          :tag => 'textarea', :attributes => { :name => 'post[body]' } } }
+      :tag => "form",
+      :attributes => { :action => "/game/save" },
+      :descendant => { :tag => "input" },
+    }
 
+    assert_equal 1, @assert_tag.length
     assert_equal expected, @assert_tag.first
+  end
+
+  def test_assert_text_area
+    assert_text_area 'post[body]'
 
-    assert_text_area '/post/save', 'post[body]',
-                     "OMG he like hates me and he's like going out with this total skank!~ oh noes!!~"
+    assert_equal 1, @assert_select.length
+    assert_equal ["textarea[name='post[body]']"], @assert_select.shift
+  end
 
-    expected = {
-      :tag => 'form', :attributes => { :action => '/post/save' },
-        :descendant => {
-          :tag => 'textarea', :attributes => { :name => 'post[body]' },
-            :content => 
-              "OMG he like hates me and he's like going out with this total skank!~ oh noes!!~" } }
+  def test_assert_text_area_body
+    assert_text_area 'post[body]', 'OMG!1! that skank stole my BF!~1!'
+
+    assert_equal 1, @assert_select.length
+    assert_equal ["textarea[name='post[body]']",
+                  { :text => 'OMG!1! that skank stole my BF!~1!' }],
+                 @assert_select.shift
+  end
+
+  def test_assert_text_area_form
+    assert_text_area '/post/save', 'post[body]'
+
+    assert_equal 2, @assert_select.length
+    assert_equal ["form[action='/post/save']"], @assert_select.shift
+    assert_equal ["textarea[name='post[body]']"], @assert_select.shift
+  end
+
+  def test_assert_title
+    assert_title 'hi'
+
+    assert_equal [['title', { :text => 'hi' }]], @assert_select
+  end
 
-    assert_equal expected, @assert_tag.last
+  def test_deny_links_to
+    deny_links_to '/game/show/1', 'hi'
+
+    expected = ["a[href='/game/show/1']", { :text => 'hi', :count => 0 }]
+
+    assert_equal 1, @assert_select.length
+    assert_equal expected, @assert_select.first
   end
 
   def assert_tag(arg)
     @assert_tag << arg
   end
 
+  def assert_no_tag(arg)
+    @assert_no_tag << arg
+  end
+
+  def assert_select(*args)
+    @assert_select << args
+    yield if block_given?
+  end
+
 end if $TESTING_RTC
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: ZenTest
 version: !ruby/object:Gem::Version 
-  version: 3.6.0
-date: 2007-05-25 00:00:00 -07:00
+  version: 3.6.1
+date: 2007-07-23 00:00:00 -07:00
 summary: "ZenTest provides 4 different tools and 1 library: zentest, unit_diff, autotest, multiruby, and Test::Rails."
 require_paths: 
 - lib
@@ -134,5 +134,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.1
+        version: 1.2.2
     version: