locator 0.0.6 → 0.0.7

data/Rakefile

@@ -9,23 +9,4 @@ task :default => :test
 desc 'Run all tests.'
 Rake::TestTask.new(:test) do |t|
   load 'test/all.rb'
-end
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |s|
-    require File.expand_path("../lib/locator/version", __FILE__)
-
-    s.name = "locator"
-    s.version = Locator::VERSION
-    s.summary = "Generic html element locators for integration testing"
-    s.email = "svenfuchs@artweb-design.de"
-    s.homepage = "http://github.com/svenfuchs/locator"
-    s.description = "Generic html element locators for integration testing"
-    s.authors = ['Sven Fuchs']
-    s.files =  FileList["[A-Z]*", "{lib,test,vendor}/**/*"]
-    s.add_dependency 'htmlentities'
-  end
-rescue LoadError
-  puts "Jeweler, or one of its dependencies, is not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
-end
+end

data/lib/locator/matcher.rb

@@ -1,70 +1,84 @@
 module Locator
   module Matcher
-    autoload :HaveTag, 'locator/matcher/have_tag'
+    autoload :HaveTag,      'locator/matcher/have_tag'
+    autoload :HaveCssClass, 'locator/matcher/have_css_class'
 
     # Matches an HTML document with whatever string is given
     def contain(*args)
       HaveTag.new(*args)
     end
 
+    def have_tag(*args, &block)
+      HaveTag.new(*args, &block)
+    end
+
+    def have_xpath(xpath, options = {}, &block)
+      HaveTag.new(options.delete(:content), options.merge(:xpath => xpath), &block)
+    end
+
+    def have_css(css, options = {}, &block)
+      HaveTag.new(options.delete(:content), options.merge(:css => css), &block)
+    end
+
+    def have_css_class(css_class)
+      HaveCssClass.new(css_class)
+    end
+
     # Asserts that the response body contains the given string or regexp
-    def assert_contain(*args)
+    def assert_contains(*args)
       matcher = contain(*args)
       assert matcher.matches?(response.body), matcher.failure_message
     end
 
     # Asserts that the response body does not contain the given string or regexp
-    def assert_not_contain(*args)
+    def assert_does_not_contain(*args)
       matcher = contain(*args)
       assert !matcher.matches?(response.body), matcher.negative_failure_message
     end
 
-    def have_tag(*args, &block)
-      HaveTag.new(*args, &block)
-    end
-
-    def assert_have_tag(html, *args, &block)
+    def assert_has_tag(html, *args, &block)
       matcher = have_tag(*args, &block)
       assert matcher.matches?(response.body), matcher.failure_message
     end
 
-    def assert_have_no_tag(html, *args, &block)
+    def assert_no_tag(html, *args, &block)
       matcher = have_tag(*args, &block)
       assert !matcher.matches?(response.body), matcher.negative_failure_message
     end
 
-    # Matches HTML content against an XPath
-    def have_xpath(xpath, options = {}, &block)
-      HaveTag.new(options.delete(:content), options.merge(:xpath => xpath), &block)
-    end
-
     # Asserts that the response body matches the given XPath
-    def assert_have_xpath(html, *args, &block)
+    def assert_has_xpath(html, *args, &block)
       matcher = have_xpath(*args, &block)
       assert matcher.matches?(response.body), matcher.failure_message
     end
 
     # Asserts that the response body does not match the given XPath
-    def assert_have_no_xpath(html, *args, &block)
+    def assert_no_xpath(html, *args, &block)
       matcher = have_xpath(*args, &block)
       assert !matcher.matches?(response.body), matcher.negative_failure_message
     end
 
-    # Matches HTML content against a CSS selector.
-    def have_css(css, options = {}, &block)
-      HaveTag.new(options.delete(:content), options.merge(:css => css), &block)
-    end
-
     # Asserts that the response body matches the given CSS selector
-    def assert_have_css(html, *args, &block)
+    def assert_has_css(html, *args, &block)
       matcher = have_css(*args, &block)
       assert matcher.matches?(response.body), matcher.failure_message
     end
 
     # Asserts that the response body does not match the given CSS selector
-    def assert_have_no_css(html, *args, &block)
+    def assert_no_css(html, *args, &block)
       matcher = have_css(*args, &block)
       assert !matcher.matches?(response.body), matcher.negative_failure_message
     end
+
+    def assert_css_class(css_classes, css_class)
+      matcher = HaveCssClass.new(css_class)
+      assert matcher.matches?(css_classes.body), matcher.failure_message
+    end
+
+    def assert_no_css_class(css_classes, css_class)
+      matcher = HaveCssClass.new(css_class)
+      assert matcher.matches?(css_classes.body), matcher.negative_failure_message
+    end
+
   end
 end

data/lib/locator/matcher/have_css_class.rb

@@ -0,0 +1,24 @@
+module Locator
+  module Matcher
+    class HaveCssClass
+      attr_reader :target, :css_class
+    
+      def initialize(css_class)
+        @css_class = css_class
+      end
+
+      def matches?(target = nil)
+        @target = target
+        " #{target} ".include?(" #{css_class} ")
+      end
+
+      def failure_message
+        "expected #{target.inspect} to include the css class #{css_class.inspect}"
+      end
+
+      def negative_failure_message
+        "expected #{target.inspect} not to include the css class #{css_class.inspect}"
+      end
+    end
+  end
+end

data/lib/locator/version.rb

@@ -1,3 +1,3 @@
 module Locator
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Sven Fuchs
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-02 00:00:00 +02:00
+date: 2010-04-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,37 +25,33 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
+        - 4
+        - 2
         - 0
-        version: "0"
+        version: 4.2.0
   type: :runtime
   version_requirements: *id001
-description: Generic html element locators for integration testing
+description: Generic html element locators for integration testing.
 email: svenfuchs@artweb-design.de
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.textile
-- TODO
+extra_rdoc_files: []
+
 files: 
-- README.textile
-- Rakefile
-- TODO
 - lib/core_ext/hash/except.rb
 - lib/core_ext/hash/slice.rb
 - lib/core_ext/string/underscore.rb
-- lib/locator.rb
 - lib/locator/boolean.rb
 - lib/locator/decoding.rb
-- lib/locator/dom.rb
-- lib/locator/dom/htmlunit.rb
 - lib/locator/dom/htmlunit/element.rb
 - lib/locator/dom/htmlunit/page.rb
-- lib/locator/dom/nokogiri.rb
+- lib/locator/dom/htmlunit.rb
 - lib/locator/dom/nokogiri/element.rb
 - lib/locator/dom/nokogiri/page.rb
-- lib/locator/element.rb
+- lib/locator/dom/nokogiri.rb
+- lib/locator/dom.rb
 - lib/locator/element/area.rb
 - lib/locator/element/button.rb
 - lib/locator/element/check_box.rb
@@ -74,38 +70,24 @@ files:
 - lib/locator/element/select.rb
 - lib/locator/element/select_option.rb
 - lib/locator/element/text_area.rb
-- lib/locator/matcher.rb
+- lib/locator/element.rb
+- lib/locator/matcher/have_css_class.rb
 - lib/locator/matcher/have_tag.rb
+- lib/locator/matcher.rb
 - lib/locator/result.rb
 - lib/locator/version.rb
 - lib/locator/xpath.rb
-- test/all.rb
-- test/locator/boolean_test.rb
-- test/locator/dom/htmlunit_test.rb
-- test/locator/dom/nokogiri_test.rb
-- test/locator/element/button_test.rb
-- test/locator/element/field_test.rb
-- test/locator/element/form_test.rb
-- test/locator/element/hidden_field_test.rb
-- test/locator/element/label_test.rb
-- test/locator/element/link_test.rb
-- test/locator/element/select_option_test.rb
-- test/locator/element/select_test.rb
-- test/locator/element/text_area_test.rb
-- test/locator/element_test.rb
-- test/locator/matcher/have_content_test.rb
-- test/locator/matcher/have_tag_test.rb
-- test/locator/xpath_test.rb
-- test/locator_test.rb
-- test/test_helper.rb
-- test/webrat.rb
+- lib/locator.rb
+- Rakefile
+- README.textile
+- TODO
 has_rdoc: true
 homepage: http://github.com/svenfuchs/locator
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -120,33 +102,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 6
+      version: 1.3.6
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: "[none]"
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Generic html element locators for integration testing
-test_files: 
-- test/all.rb
-- test/locator/boolean_test.rb
-- test/locator/dom/htmlunit_test.rb
-- test/locator/dom/nokogiri_test.rb
-- test/locator/element/button_test.rb
-- test/locator/element/field_test.rb
-- test/locator/element/form_test.rb
-- test/locator/element/hidden_field_test.rb
-- test/locator/element/label_test.rb
-- test/locator/element/link_test.rb
-- test/locator/element/select_option_test.rb
-- test/locator/element/select_test.rb
-- test/locator/element/text_area_test.rb
-- test/locator/element_test.rb
-- test/locator/matcher/have_content_test.rb
-- test/locator/matcher/have_tag_test.rb
-- test/locator/xpath_test.rb
-- test/locator_test.rb
-- test/test_helper.rb
-- test/webrat.rb
+test_files: []
+

data/test/all.rb

@@ -1,6 +0,0 @@
-files = Dir[File.dirname(__FILE__) + '/**/*_test.rb']
-# files.reject! { |file| file.include?('htmlunit') }
-
-files.each do |filename|
-  require filename # unless filename.include?('_locator')
-end

data/test/locator/boolean_test.rb

@@ -1,40 +0,0 @@
-require File.expand_path('../../test_helper', __FILE__)
-require 'locator/xpath'
-
-class XpathBooleanTest < Test::Unit::TestCase
-  Or, And = Locator::Boolean::Or, Locator::Boolean::And
-
-  def setup
-    Or.operator, And.operator = ' | ', ' & '
-  end
-
-  test "a | b => a | b" do
-    path = Or.new('a', 'b').to_s
-    assert_equal "a | b", path
-  end
-
-  test "a & b => a & b" do
-    path = And.new('a', 'b').to_s
-    assert_equal "a & b", path
-  end
-
-  test "(a & b) | c => a & b | c" do
-    path = And.new('a', 'b').or('c').to_s
-    assert_equal "a & b | c", path
-  end
-
-  test "(a | b) & c => a & c | b & c" do
-    path = Or.new('a', 'b').and('c').to_s
-    assert_equal "a & c | b & c", path
-  end
-
-  test "(a & b | c) & d => a & b & d | c & d" do
-    path = And.new('a', 'b').or('c').and('d').to_s
-    assert_equal "a & b & d | c & d", path
-  end
-
-  test "(a & b | c) & (d | e) => a & b & d | a & b & e | c & d | c & e" do
-    path = And.new('a', 'b').or('c').and(Or.new('d', 'e')).to_s
-    assert_equal "a & b & d | a & b & e | c & d | c & e", path
-  end
-end

data/test/locator/dom/htmlunit_test.rb

@@ -1,81 +0,0 @@
-require File.expand_path('../../../test_helper', __FILE__)
-
-$: << '~/Development/projects/steam/lib'
-begin
-  require 'steam'
-  include Steam
-
-  Java.load(Dir["#{Steam.config[:html_unit][:java_path]}/*.jar"].join(':'))
-  Java.import 'com.gargoylesoftware.htmlunit.WebClient'
-  Java.import 'com.gargoylesoftware.htmlunit.BrowserVersion'
-
-  class HtmlunitElementTest < Test::Unit::TestCase
-    include Locator, Java::Com::Gargoylesoftware::Htmlunit
-
-    def setup
-      connection = Connection::Mock.new
-      client = WebClient.new(BrowserVersion.FIREFOX_3)
-      client.setWebConnection(Rjb::bind(Browser::HtmlUnit::Connection.new(connection), 'com.gargoylesoftware.htmlunit.WebConnection'))
-
-      connection.mock(:get, 'http://localhost:3000/', '<a href="#" class="foo">the link</a><div id="bar"></div>')
-      @dom = Dom::Htmlunit::Page.new(client.getPage('http://localhost:3000/'))
-    end
-
-    test "Element takes a Htmlunit::Page adapter" do
-      element = Element::Link.new.locate(@dom, 'the link', :class => 'foo')
-      assert element.name
-    end
-
-    test "responds to name" do
-      element = Element::Link.new.locate(@dom, 'the link')
-      assert_equal 'a', element.name
-    end
-
-    test "responds to xpath" do
-      element = Element::Link.new.locate(@dom, 'the link')
-      assert_equal '/html/body/a', element.xpath
-    end
-
-    test "responds to to_s" do
-      element = Element::Link.new.locate(@dom, 'the link')
-      assert_equal "<a href=\"#\" class=\"foo\">\n  the link\n</a>\n", element.to_s
-    end
-
-    test "responds to content" do
-      element = Element::Link.new.locate(@dom, 'the link')
-      assert_equal "the link", element.content
-    end
-
-    test "responds to attribute" do
-      element = Element::Link.new.locate(@dom, 'the link')
-      assert_equal 'foo', element.attribute('class')
-    end
-
-    test "responds to element_by_id" do
-      element = Element.new(:html).locate(@dom)
-      assert_equal 'bar', element.element_by_id('bar').attribute('id')
-    end
-
-    test "responds to element_by_xpath" do
-      element = Element.new(:html).locate(@dom)
-      assert_equal 'bar', element.element_by_xpath('//html/body/div[@id="bar"]').attribute('id')
-    end
-  
-    test "responds to elements_by_xpath" do
-      element = Element::Link.new.locate(@dom, 'the link')
-      assert_equal 'foo', element.attribute('class')
-    end
-
-    test "responds to ancestors" do
-      element = Element.new(:a).locate(@dom)
-      assert_equal %w(html body), element.ancestors.map { |e| e.name }
-    end
-
-    test "responds to ancestor_of?" do
-      element = Element.new(:a).locate(@dom)
-      assert_equal %w(html body), element.ancestors.map { |e| e.name }
-    end
-  end
-rescue LoadError
-  puts "skipping HtmlUnit tests because Steam is not available"
-end