selenium_fury 1.0.2 → 1.0.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: fd83fba7efc074d50e44f358412f6f6eeecc0628
+  data.tar.gz: aeb58034cad8ddf5956872a8eef08881ac3adc0e
+SHA512:
+  metadata.gz: 7d01cef0793d4cab7eba865576d6afb3d90f8b172d206ee3a136fc129dcffbb176af500337488719df37dcd4e007d1898dfcbca87f301b823a93df0551b8173c
+  data.tar.gz: a5999ac5c9cfd76830bb58d807bd3de53ab347d21a1a5a5d5b6d3e25835a08f7f00452cbf7f823e066c86714242f4d8d01d44e3d19edc15e9207f16e9089ea73

data/Rakefile

@@ -1,13 +1,11 @@
 #!/usr/bin/env rake
-#require 'rubygems'
-#require 'bundler/setup'
-
 require 'rspec'
 require 'rspec/core/rake_task'
 require 'cucumber'
 require 'cucumber/rake/task'
 
 require "bundler/gem_tasks"
+require 'parallel_tests/tasks'
 
 RSpec::Core::RakeTask.new(:spec)
 Cucumber::Rake::Task.new(:feature)
@@ -15,12 +13,3 @@ Cucumber::Rake::Task.new(:feature)
 task :default => :spec
 
 
-
-#desc 'Push gem to gem server'
-#  task 'release' => ['gem:build', 'gem:git:release'] do
-#    jeweler = Rake.application.jeweler
-#    gemspec = jeweler.gemspec
-#    command = "gem push pkg/#{gemspec.name}-#{jeweler.version}.gem"
-#    puts "Executing #{command.inspect}:"
-#    system command
-#  end

data/lib/selenium_fury/selenium_web_driver/generic_elements/generic_element.rb

@@ -7,11 +7,12 @@ module SeleniumFury
         include ElementWaitHelpers
 
         def initialize(locator, driver=nil, opt={})
-          @location = locator
+          @original_location = locator.freeze
+          @location = Marshal.load(Marshal.dump(@original_location))
           @driver = driver
           @tags = opt[:tags]
           # Should validate if opt[:validate] is nil, should not validate if doing dynamic matchin
-          @validate = opt[:validate] != false  && !locator.values.first.match(/\^([^=].*?)\$/)
+          @validate = opt[:validate] != false  && !locator.values.first.match(/__/)
           # This is different from implicit_wait. This explicitly waits for this element, not for entire driver session.
           @wait = 10 || opt[:wait]
         end
@@ -24,12 +25,9 @@ module SeleniumFury
         end
 
         def update_locator(variables)
-          locator_value = @location.values.first
-          variables.each { |key, value|
-            locator_value.scan(/\^([^=]\w*)\$/).flatten.each { |match|
-              locator_value.gsub!("^#{match}$", value.to_s) if match == key.to_s
-            }
-          }
+          locator = Marshal.load(Marshal.dump(@original_location))
+          variables.each { |key, value| locator.first[1].gsub! ('__' + key.to_s.upcase + '__'), value.to_s }
+          @location = locator
           self
         end
 

data/lib/selenium_fury/selenium_web_driver/generic_elements/generic_element_helpers.rb

@@ -48,11 +48,11 @@ module ElementWaitHelpers
   end
 
   def wait_present(timeout=@wait)
-    wait_for(timeout: timeout) { present? }
+    wait_for(timeout: timeout, message: "Element at #{location} is not present") { present? }
   end
 
   def wait_not_present(timeout=@wait)
-    wait_for(timeout: timeout) { !present? }
+    wait_for(timeout: timeout, message: "Element at #{location} is still present") { !present? }
   end
 
   def wait_visible(timeout=@wait)
@@ -62,16 +62,16 @@ module ElementWaitHelpers
 
   # Raises error if not present
   def wait_visible!(timeout=@wait)
-    wait_for(timeout: timeout) { visible? }
+    wait_for(timeout: timeout, message: "Element at #{location} is not visible") { visible? }
   end
 
   def wait_not_visible(timeout=@wait)
-    wait_for(timeout: timeout) { !present? || !visible? }
+    wait_for(timeout: timeout, message: "Element at #{location} is still visible") { !present? || !visible? }
   end
 
   # Raises error if not present
   def wait_not_visible!(timeout=@wait)
-    wait_for(timeout: timeout) { !visible? }
+    wait_for(timeout: timeout, message: "Element at #{location} is still visible") { !visible? }
   end
 end
 

data/lib/selenium_fury/version.rb

@@ -1,3 +1,3 @@
 module SeleniumFury
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/lib/selenium_fury.rb

@@ -1,39 +1,36 @@
 #/* Copyright (c) 2010 HomeAway, Inc.
 # * All rights reserved.  http://www.homeaway.com
 # *
-# * Licensed under the Apache License, Version 2.0 (the "License");
+# * Licensed under the Apache License, Version 2.0 (the 'License');
 # * you may not use this file except in compliance with the License.
 # * You may obtain a copy of the License at
 # *
 # *      http://www.apache.org/licenses/LICENSE-2.0
 # *
 # * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
+# * distributed under the License is distributed on an 'AS IS' BASIS,
 # * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # * See the License for the specific language governing permissions and
 # * limitations under the License.
 # */
-
-require "selenium_fury/version"
 require 'rubygems'
 require 'bundler'
 
-require "selenium/webdriver/common/timeouts"
-
-require "selenium-webdriver"
-require "selenium-client"
+require 'selenium-webdriver'
 require 'nokogiri'
 
-require "selenium_fury/common/page_parser"
-require "selenium_fury/selenium_web_driver/create_selenium_web_driver"
-require "selenium_fury/selenium_web_driver/element_finder"
-require "selenium_fury/selenium_web_driver/page_object_components"
-require "selenium_fury/selenium_web_driver/page_object"
-require "selenium_fury/selenium_web_driver/page_generator"
-require "selenium_fury/selenium_web_driver/page_validator"
+require 'selenium_fury/version'
+require 'selenium/webdriver/common/timeouts'
+require 'selenium_fury/common/page_parser'
+require 'selenium_fury/selenium_web_driver/create_selenium_web_driver'
+require 'selenium_fury/selenium_web_driver/element_finder'
+require 'selenium_fury/selenium_web_driver/page_object_components'
+require 'selenium_fury/selenium_web_driver/page_object'
+require 'selenium_fury/selenium_web_driver/page_generator'
+require 'selenium_fury/selenium_web_driver/page_validator'
 
-require "selenium_fury/selenium_web_driver/generic_elements/generic_element_helpers"
-require "selenium_fury/selenium_web_driver/generic_elements/generic_element"
+require 'selenium_fury/selenium_web_driver/generic_elements/generic_element_helpers'
+require 'selenium_fury/selenium_web_driver/generic_elements/generic_element'
 
 include SeleniumFury::SeleniumWebDriver::PageGenerator
 include SeleniumFury::SeleniumWebDriver::PageValidator

data/selenium_fury.gemspec

@@ -13,10 +13,12 @@ Gem::Specification.new do |gem|
   gem.name          = "selenium_fury"
   gem.require_paths = ["lib"]
   gem.version       = SeleniumFury::VERSION
-  gem.add_dependency('selenium-webdriver')
-  gem.add_dependency('nokogiri')
+  gem.add_dependency('selenium-webdriver','~> 2')
+  gem.add_dependency('nokogiri','~> 1')
   gem.add_development_dependency('rspec','~>2.12')
   gem.add_development_dependency('cucumber')
   gem.add_development_dependency('redcarpet')
   gem.add_development_dependency('rake')
+  gem.add_development_dependency('json', '~> 1.7.7')
+  gem.add_development_dependency('parallel_tests')
 end

data/spec/{selenium_web_driver → selenium_fury/selenium_web_driver/generic_elements}/generic_elements_spec.rb

@@ -22,6 +22,15 @@ describe PageObject do
       specific_element.location.should == {css: "a[id='link333333']"}
       specific_element.link.should == 'http://google.com/'
     end
+
+    it 'should allow changing the selector to allow for different selections with the same element' do
+      specific_element = test_page.dynamic_locator_css.update_locator(locator: 'id', id: 333333)
+      specific_element.location.should == {css: "a[id='link333333']"}
+      specific_element.link.should == 'http://google.com/'
+      specific_element = test_page.dynamic_locator_css.update_locator(locator: 'id', id: 222222)
+      specific_element.location.should == {css: "a[id='link222222']"}
+      specific_element.link.should == 'http://yahoo.com/'
+    end
   end
 
   describe SeleniumFury::SeleniumWebDriver::PageObjectComponents::GenericElement do

data/spec/test_page/test_page.rb

@@ -34,8 +34,8 @@ class TestPage < PageObject
   image_element         :input_image_element, {id: 'input_image'}
 
   link_element          :link_element, {id: 'link111111'}
-  link_element          :dynamic_locator_css, {css: "a[^locator$='link^id$']"}
-  link_element          :dynamic_locator_id, {id: 'link^id$'}
+  link_element          :dynamic_locator_css, {css: "a[__LOCATOR__='link__ID__']"}
+  link_element          :dynamic_locator_id, {id: 'link__ID__'}
 
   radio_button_element  :input_radio_element, {id: 'input_radio'}
 

metadata

@@ -1,52 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: selenium_fury
 version: !ruby/object:Gem::Version
-  version: 1.0.2
-  prerelease: 
+  version: 1.0.3
 platform: ruby
 authors:
 - Scott Sims
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-05 00:00:00.000000000 Z
+date: 2013-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,49 +55,71 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
   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: redcarpet
   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: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.7.7
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.7.7
+- !ruby/object:Gem::Dependency
+  name: parallel_tests
+  requirement: !ruby/object:Gem::Requirement
+    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'
 description: Generate and validate page objects with this page object factory for
@@ -142,13 +157,13 @@ files:
 - lib/selenium_fury/selenium_web_driver/page_validator.rb
 - lib/selenium_fury/version.rb
 - selenium_fury.gemspec
-- spec/common/page_parser_spec.rb
 - spec/selenium/webdriver/common/timeouts_spec.rb
-- spec/selenium_web_driver/element_finder_spec.rb
-- spec/selenium_web_driver/generic_elements_spec.rb
-- spec/selenium_web_driver/page_generator_spec.rb
-- spec/selenium_web_driver/page_object_spec.rb
-- spec/selenium_web_driver/page_validator_spec.rb
+- spec/selenium_fury/common/page_parser_spec.rb
+- spec/selenium_fury/selenium_web_driver/element_finder_spec.rb
+- spec/selenium_fury/selenium_web_driver/generic_elements/generic_elements_spec.rb
+- spec/selenium_fury/selenium_web_driver/page_generator_spec.rb
+- spec/selenium_fury/selenium_web_driver/page_object_spec.rb
+- spec/selenium_fury/selenium_web_driver/page_validator_spec.rb
 - spec/spec_helper.rb
 - spec/test_page/Spacer.gif
 - spec/test_page/test_page.html
@@ -156,33 +171,26 @@ files:
 - spec/test_page/test_page_custom_generator_configuration.rb
 homepage: https://github.com/scottcsims/SeleniumFury
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1088754158506320944
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1088754158506320944
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Generate Selenium Page Objects
 test_files:
 - features/generate_page_object.feature
@@ -191,13 +199,13 @@ test_files:
 - features/support/env.rb
 - features/support/hooks.rb
 - features/validate_page_object.feature
-- spec/common/page_parser_spec.rb
 - spec/selenium/webdriver/common/timeouts_spec.rb
-- spec/selenium_web_driver/element_finder_spec.rb
-- spec/selenium_web_driver/generic_elements_spec.rb
-- spec/selenium_web_driver/page_generator_spec.rb
-- spec/selenium_web_driver/page_object_spec.rb
-- spec/selenium_web_driver/page_validator_spec.rb
+- spec/selenium_fury/common/page_parser_spec.rb
+- spec/selenium_fury/selenium_web_driver/element_finder_spec.rb
+- spec/selenium_fury/selenium_web_driver/generic_elements/generic_elements_spec.rb
+- spec/selenium_fury/selenium_web_driver/page_generator_spec.rb
+- spec/selenium_fury/selenium_web_driver/page_object_spec.rb
+- spec/selenium_fury/selenium_web_driver/page_validator_spec.rb
 - spec/spec_helper.rb
 - spec/test_page/Spacer.gif
 - spec/test_page/test_page.html