splinter 0.0.8 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a32fc8fdf603849cedc22a647f6bc8772bd9437
-  data.tar.gz: 0a796f046cf187c7cd907670f669fd82f32b57c5
+  metadata.gz: b7f9a91d2107588dae76e0904e8c5c27b5a4649e
+  data.tar.gz: def9ed48cc1a20aa7bb5269793cb915dee364e68
 SHA512:
-  metadata.gz: 49d47dce8d3cc4e97faf72d66385f0c8c372fe9fc997032abd24109c85ba43101696437d1cbb8daa4e5528a8c17a00eea7f5258dba000ac996686e294862e6cd
-  data.tar.gz: f9df7cc282727cf1b00c2d48994d96ba704bc0e35465d183038f357714eaaebd28046ce846f7026c5e13c86dc2300245ca8cef2a6733344d8f3c08fc00ca8906
+  metadata.gz: 7d24c3bc71bb5cde5028a084d3f50ffd5354d8bec53ec543e7875e46dc0e19d7c433a305668c7ae89d78c3fee4e04de62f9e257eca2a53eae3214b2647205b55
+  data.tar.gz: db71ccb0aeaacbf25ec50b9c1f02a451b89aa70beb0d25703dd3c7b8ea533d4bf96f22df7f93471ca77ebdbaf0b01fbade572c121180742b7e1bef271e354553

data/lib/splinter/capybara/actions.rb

@@ -107,13 +107,10 @@ module Splinter
       # select_id - CSS ID to check, do *not* include #
       # value     - The value to select.
       def find_and_select_option(select_id, value)
-        select_err = "cannot select option, no select box with id '##{select_id}' found"
-        option_err = "cannot select option, no option with text '#{value}' in select box '##{select_id}'"
-
-        select = find(:css, "##{select_id}", :message => select_err)
+        select = find(:css, "##{select_id}")
         path = ".//option[contains(./@value, '#{value}')]"
 
-        select.find(:xpath, path, :message => option_err).select_option
+        select.find(:xpath, path).select_option
       end
 
       # Simulates a javascript alert confirmation. You need to pass in a block that will
@@ -145,17 +142,12 @@ module Splinter
           raise ArgumentError, "You must supply either :from or :id_prefix option"
         end
 
-        select_prefix   = options[:id_prefix]
-        select_prefix ||= find_prefix_by_label(options[:from])
-
-        select_prefix
+        options[:id_prefix] || find_prefix_by_label(options[:from])
       end
 
       def find_prefix_by_label(label)
-        message = "cannot select option, select with label '#{label}' not found"
-        path    = "//label[contains(normalize-space(string(.)), '#{label}')]/@for"
-
-        find(:xpath, path, :message => message).text.sub(/_\di$/, '')
+        path = "//label[contains(normalize-space(string(.)), '#{label}')]/@for"
+        find(:xpath, path).text(:all).sub(/_\di$/, '')
       end
     end
   end

data/lib/splinter/rspec.rb

@@ -1,9 +1,9 @@
 require "splinter/capybara"
 
 RSpec.configure do |config|
-  config.include Splinter::Capybara::Actions, :type => :request
+  config.include Splinter::Capybara::Actions, :type => :feature
 
-  config.after :each, :type => :request do
+  config.after :each, :type => :feature do
     take_screenshot! if Splinter.screenshot_directory &&
       example.exception && example.metadata[:js]
 

data/lib/splinter/version.rb

@@ -1,3 +1,3 @@
 module Splinter
-  VERSION = Version = '0.0.8'
+  VERSION = Version = '0.1.0'
 end

data/spec/splinter/capybara/actions_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'test_app/server'
 require 'rack/test'
 
-describe Splinter, :type => :request do
+describe Splinter, :type => :feature do
   include Rack::Test::Methods
 
   def time

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: splinter
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.1.0
 platform: ruby
 authors:
 - Joshua Priddle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-09 00:00:00.000000000 Z
+date: 2013-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 2.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement