capybara-harness 0.0.13 → 0.0.14

data/.gitignore

@@ -1,4 +1,5 @@
 *.gem
+capybara-*.html
 *.rbc
 .bundle
 .idea

data/capybara-harness.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_development_dependency('rspec')
+  gem.add_development_dependency('launchy')
   gem.add_runtime_dependency('capybara', '>= 1.1')
+  gem.add_development_dependency("sinatra", [">= 0.9.4"])
   gem.add_runtime_dependency(%q<activesupport>, [">= 3.0"])
 end

data/lib/capybara/harness/dom/attribute.rb

@@ -1,6 +1,5 @@
 module Capybara::Harness::Dom
   class Attribute
-    include Capybara::DSL
 
     attr_accessor :name, :derived_value_block
 

data/lib/capybara/harness/dom/field.rb

@@ -2,22 +2,34 @@ module Capybara::Harness::Dom
   class Field
     include Capybara::DSL
 
-    attr_accessor :name, :label, :data_type, :through
+    attr_accessor :name, :label, :as, :through
 
-    def initialize(options = {})
-      self.name = options.delete(:name)
-      self.label = options.fetch(:label, name.to_s.titleize)
-      self.data_type = options.fetch(:data_type, :string)
-      self.through = options.delete(:through)
+    def initialize(name, options = {})
+      @name = name.to_sym
+      @through = extract_option_as_sym(:through, options)
+      @label = options.fetch(:label, name.to_s.titleize)
+      @as = options.fetch(:as, :string).to_sym
     end
 
     def fill(attrs = {})
       value = extract_value(attrs)
-      case data_type
+      case as
         when :string then
           fill_in(label, :with => value)
         when :select then
           select(value, :from => label)
+        when :file
+          attach_file(label, value)
+        when :radio
+          choose(label)
+        when :checkbox, :checkboxes
+          if value.is_a?(Hash)
+            value.each { |label, v| checkbox(v, label) }
+          elsif value.is_a?(Array)
+            value.each { |v| checkbox(v) }
+          else
+            check(value, label)
+          end
       end
     end
 
@@ -25,10 +37,6 @@ module Capybara::Harness::Dom
       @through.to_sym if @through
     end
 
-    def name
-      @name.to_sym
-    end
-
     private
 
     def has_attribute?(attrs)
@@ -41,5 +49,15 @@ module Capybara::Harness::Dom
       attrs[name.to_sym]
     end
 
+    def extract_option_as_sym(option_name, options)
+      option = options.delete(option_name)
+      option.nil? ? nil : option.to_sym
+    end
+
+    def check(value, label = nil)
+      label = value if label.nil?
+      [false, nil, 0].include?(value) ? uncheck(label) : super(label)
+    end
+
   end
 end

data/lib/capybara/harness/dom/reader.rb

@@ -16,7 +16,7 @@ module Capybara::Harness::Dom
 
     # Public: Scans the DOM and finds the node that represents the subject.
     def find_element(values = {})
-      page.find(".#{name} .#{finder_attr_name}", :text => finder_attr.derive_value(values)).find(:xpath, ".//ancestor::*[@class='#{name}']")
+      page.find(".#{name} .#{finder_attr_name}", :visible => true, :text => finder_attr.derive_value(values)).find(:xpath, ".//ancestor::*[@class='#{name}']")
     end
 
     # Public: Scans the DOM and finds the node that represents the subject's list element.
@@ -49,12 +49,12 @@ module Capybara::Harness::Dom
     end
 
     def has_attrs?(values = {})
-      return false unless page.has_css?(".#{name} .#{finder_attr_name}", :text => finder_attr.derive_value(values))
+      return false unless page.has_css?(".#{name} .#{finder_attr_name}", :visible => true, :text => finder_attr.derive_value(values))
 
       node = find_element(values)
       attributes.each do |attr_name, attr|
         text = attr.derive_value(values)
-        return false unless node.has_css?(".#{attr_name}", :text => text)
+        return false unless node.has_css?(".#{attr_name}", :visible => true, :text => text)
       end
 
       true

data/lib/capybara/harness/dom/writer.rb

@@ -10,7 +10,7 @@ module Capybara::Harness::Dom
       options = args.last.is_a?(Hash) ? args.pop : {}
 
       args.each do |field_name|
-        fields << Capybara::Harness::Dom::Field.new(options.merge(:name => field_name))
+        fields << Capybara::Harness::Dom::Field.new(field_name, options)
       end
     end
 

data/lib/capybara/harness/version.rb

@@ -1,5 +1,5 @@
 module Capybara
   module Harness
-    VERSION = "0.0.13"
+    VERSION = "0.0.14"
   end
 end

data/spec/dom/field_spec.rb

@@ -0,0 +1,92 @@
+require 'spec_helper'
+
+describe Capybara::Harness::Dom::Field do
+
+  include Capybara::DSL
+  include Capybara::RSpecMatchers
+
+  before do
+    visit('/form')
+  end
+
+  describe "#fill" do
+    context "when only name is specified" do
+      it "fills in the field" do
+        field = Capybara::Harness::Dom::Field.new(:zipcode)
+        field.fill({ zipcode: '12345'})
+        page.find_field('Zipcode').value.should == '12345'
+      end
+    end
+
+    context "when the :label option is specified" do
+      it "fills in the field" do
+        field = Capybara::Harness::Dom::Field.new(:explanation, label: 'Explanation of Name')
+        field.fill({ explanation: 'None'})
+        page.find_field('Explanation of Name').value.should == 'None'
+      end
+    end
+
+    context "when the :as option is specified" do
+      describe ":select" do
+        it "selects the field" do
+          field = Capybara::Harness::Dom::Field.new(:other_title, as: :select, label: 'Other title')
+          field.fill({ other_title: 'Miss'})
+          page.should have_select('Other title', :selected => 'Miss')
+        end
+
+        it "selects multiple values"
+      end
+
+      describe ":checkbox" do
+        context "when the supplied value is boolean" do
+          let(:field) { Capybara::Harness::Dom::Field.new(:terms, as: :checkbox, label: 'Terms of Use') }
+
+          it "checks the box when true" do
+            page.uncheck('Terms of Use')
+            field.fill({ terms: true })
+            page.find_field('Terms of Use').should be_checked
+          end
+
+          it "unchecks the box when false" do
+            page.check('Terms of Use')
+            field.fill({ terms: false })
+            page.find_field('Terms of Use').should_not be_checked
+          end
+        end
+
+        context "when the supplied value is an integer" do
+
+        end
+
+
+        context "when the supplied value is an array" do
+
+        end
+
+        context "when the supplied value is a hash" do
+
+        end
+
+
+        it "checks multiple values" do
+          field = Capybara::Harness::Dom::Field.new(:pets, as: :checkboxes)
+          field.fill({ pets: {  }})
+          page.find_field('Terms of Use').should_not be_checked
+        end
+
+        it "unchecks multiple values"
+      end
+
+      describe ":radio" do
+        it "selects the radio option"
+      end
+
+      describe ":file" do
+        it "fills in the field"
+      end
+    end
+
+  end
+
+
+end

data/spec/spec_helper.rb

@@ -1,7 +1,13 @@
+require "capybara"
+require "capybara/rspec" # Required here instead of in rspec_spec to avoid RSpec deprecation warning
+require "capybara/spec/test_app"
+require "capybara/spec/spec_helper"
 require 'capybara-harness'
 
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
-end
+  config.before { Capybara::SpecHelper.reset! }
+  config.after { Capybara::SpecHelper.reset! }
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara-harness
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-29 00:00:00.000000000 Z
+date: 2013-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -43,6 +59,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.4
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -84,6 +116,7 @@ files:
 - lib/capybara/harness/dom_harness.rb
 - lib/capybara/harness/version.rb
 - spec/dom/attribute_spec.rb
+- spec/dom/field_spec.rb
 - spec/dom/reader_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/twmills/capybara-harness
@@ -113,5 +146,6 @@ summary: A test harness strategy to easily query and manipulate DOM elements as
   objects in the context of feature or acceptance tests.
 test_files:
 - spec/dom/attribute_spec.rb
+- spec/dom/field_spec.rb
 - spec/dom/reader_spec.rb
 - spec/spec_helper.rb