Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
test/test_apps/**/tmp
test/test_apps/**/log
test/test_apps/**/.bundle
test/test_apps/**/db/*.sqlite3
test/test_apps/**/log/*.log
test/test_apps/**/tmp/**/*

*.sqlite3
pkg
.idea
Gemfile.lock
gemfiles/*.gemfile.lock
test/test_apps/**/Gemfile.lock
.bundle

12 changes: 6 additions & 6 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
appraise "3.0" do
gem 'activesupport', '~> 3.0.10'
gem 'railties', '~> 3.0.10'
gem 'activesupport', '~> 3.0.20'
gem 'railties', '~> 3.0.20'
end

appraise "3.1" do
gem 'activesupport', '~> 3.1.8'
gem 'railties', '~> 3.1.8'
gem 'activesupport', '~> 3.1.12'
gem 'railties', '~> 3.1.12'
end

appraise "3.2" do
gem 'activesupport', '~> 3.2'
gem 'railties', '~> 3.2'
gem 'activesupport', '~> 3.2.13'
gem 'railties', '~> 3.2.13'
end
2 changes: 1 addition & 1 deletion ae_page_objects.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Gem::Specification.new do |s|
s.add_dependency("capybara", ["~> 1.1"])

s.add_development_dependency("appraisal", "~> 0.5.1")
s.add_development_dependency("mocha", "= 0.9.8")
s.add_development_dependency("mocha", "= 0.13.3")
s.add_development_dependency("selenium-webdriver", ">= 0")
end

6 changes: 3 additions & 3 deletions gemfiles/3.0.gemfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# This file was generated by Appraisal

source :rubygems
source "https://rubygems.org"

gem "activesupport", "~> 3.0.10"
gem "railties", "~> 3.0.10"
gem "activesupport", "~> 3.0.20"
gem "railties", "~> 3.0.20"

gemspec :path=>"../"
87 changes: 87 additions & 0 deletions gemfiles/3.0.gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
PATH
remote: ..
specs:
ae_page_objects (0.0.0)
activesupport (>= 3.0.0)
capybara (~> 1.1)
railties (>= 3.0.0)

GEM
remote: https://rubygems.org/
specs:
abstract (1.0.0)
actionpack (3.0.20)
activemodel (= 3.0.20)
activesupport (= 3.0.20)
builder (~> 2.1.2)
erubis (~> 2.6.6)
i18n (~> 0.5.0)
rack (~> 1.2.5)
rack-mount (~> 0.6.14)
rack-test (~> 0.5.7)
tzinfo (~> 0.3.23)
activemodel (3.0.20)
activesupport (= 3.0.20)
builder (~> 2.1.2)
i18n (~> 0.5.0)
activesupport (3.0.20)
appraisal (0.5.2)
bundler
rake
builder (2.1.2)
capybara (1.1.4)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
selenium-webdriver (~> 2.0)
xpath (~> 0.1.4)
childprocess (0.3.9)
ffi (~> 1.0, >= 1.0.11)
erubis (2.6.6)
abstract (>= 1.0.0)
ffi (1.7.0)
i18n (0.5.0)
json (1.7.7)
metaclass (0.0.1)
mime-types (1.22)
mocha (0.13.3)
metaclass (~> 0.0.1)
multi_json (1.7.2)
nokogiri (1.5.9)
rack (1.2.7)
rack-mount (0.6.14)
rack (>= 1.0.0)
rack-test (0.5.7)
rack (>= 1.0)
railties (3.0.20)
actionpack (= 3.0.20)
activesupport (= 3.0.20)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.4)
rake (10.0.4)
rdoc (3.12.2)
json (~> 1.4)
rubyzip (0.9.9)
selenium-webdriver (2.32.1)
childprocess (>= 0.2.5)
multi_json (~> 1.0)
rubyzip
websocket (~> 1.0.4)
thor (0.14.6)
tzinfo (0.3.37)
websocket (1.0.7)
xpath (0.1.4)
nokogiri (~> 1.3)

PLATFORMS
ruby

DEPENDENCIES
activesupport (~> 3.0.20)
ae_page_objects!
appraisal (~> 0.5.1)
mocha (= 0.13.3)
railties (~> 3.0.20)
selenium-webdriver
6 changes: 3 additions & 3 deletions gemfiles/3.1.gemfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# This file was generated by Appraisal

source :rubygems
source "https://rubygems.org"

gem "activesupport", "~> 3.1.8"
gem "railties", "~> 3.1.8"
gem "activesupport", "~> 3.1.12"
gem "railties", "~> 3.1.12"

gemspec :path=>"../"
97 changes: 97 additions & 0 deletions gemfiles/3.1.gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
PATH
remote: ..
specs:
ae_page_objects (0.0.0)
activesupport (>= 3.0.0)
capybara (~> 1.1)
railties (>= 3.0.0)

GEM
remote: https://rubygems.org/
specs:
actionpack (3.1.12)
activemodel (= 3.1.12)
activesupport (= 3.1.12)
builder (~> 3.0.0)
erubis (~> 2.7.0)
i18n (~> 0.6)
rack (~> 1.3.6)
rack-cache (~> 1.2)
rack-mount (~> 0.8.2)
rack-test (~> 0.6.1)
sprockets (~> 2.0.4)
activemodel (3.1.12)
activesupport (= 3.1.12)
builder (~> 3.0.0)
i18n (~> 0.6)
activesupport (3.1.12)
multi_json (~> 1.0)
appraisal (0.5.2)
bundler
rake
builder (3.0.4)
capybara (1.1.4)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
selenium-webdriver (~> 2.0)
xpath (~> 0.1.4)
childprocess (0.3.9)
ffi (~> 1.0, >= 1.0.11)
erubis (2.7.0)
ffi (1.7.0)
hike (1.2.2)
i18n (0.6.4)
json (1.7.7)
metaclass (0.0.1)
mime-types (1.22)
mocha (0.13.3)
metaclass (~> 0.0.1)
multi_json (1.7.2)
nokogiri (1.5.9)
rack (1.3.10)
rack-cache (1.2)
rack (>= 0.4)
rack-mount (0.8.3)
rack (>= 1.0.0)
rack-ssl (1.3.3)
rack
rack-test (0.6.2)
rack (>= 1.0)
railties (3.1.12)
actionpack (= 3.1.12)
activesupport (= 3.1.12)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)
rake (10.0.4)
rdoc (3.12.2)
json (~> 1.4)
rubyzip (0.9.9)
selenium-webdriver (2.32.1)
childprocess (>= 0.2.5)
multi_json (~> 1.0)
rubyzip
websocket (~> 1.0.4)
sprockets (2.0.4)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
thor (0.14.6)
tilt (1.3.7)
websocket (1.0.7)
xpath (0.1.4)
nokogiri (~> 1.3)

PLATFORMS
ruby

DEPENDENCIES
activesupport (~> 3.1.12)
ae_page_objects!
appraisal (~> 0.5.1)
mocha (= 0.13.3)
railties (~> 3.1.12)
selenium-webdriver
6 changes: 3 additions & 3 deletions gemfiles/3.2.gemfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# This file was generated by Appraisal

source :rubygems
source "https://rubygems.org"

gem "activesupport", "~> 3.2"
gem "railties", "~> 3.2"
gem "activesupport", "~> 3.2.13"
gem "railties", "~> 3.2.13"

gemspec :path=>"../"
96 changes: 96 additions & 0 deletions gemfiles/3.2.gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
PATH
remote: ..
specs:
ae_page_objects (0.0.0)
activesupport (>= 3.0.0)
capybara (~> 1.1)
railties (>= 3.0.0)

GEM
remote: https://rubygems.org/
specs:
actionpack (3.2.13)
activemodel (= 3.2.13)
activesupport (= 3.2.13)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
rack (~> 1.4.5)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
activemodel (3.2.13)
activesupport (= 3.2.13)
builder (~> 3.0.0)
activesupport (3.2.13)
i18n (= 0.6.1)
multi_json (~> 1.0)
appraisal (0.5.2)
bundler
rake
builder (3.0.4)
capybara (1.1.4)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
selenium-webdriver (~> 2.0)
xpath (~> 0.1.4)
childprocess (0.3.9)
ffi (~> 1.0, >= 1.0.11)
erubis (2.7.0)
ffi (1.7.0)
hike (1.2.2)
i18n (0.6.1)
journey (1.0.4)
json (1.7.7)
metaclass (0.0.1)
mime-types (1.22)
mocha (0.13.3)
metaclass (~> 0.0.1)
multi_json (1.7.2)
nokogiri (1.5.9)
rack (1.4.5)
rack-cache (1.2)
rack (>= 0.4)
rack-ssl (1.3.3)
rack
rack-test (0.6.2)
rack (>= 1.0)
railties (3.2.13)
actionpack (= 3.2.13)
activesupport (= 3.2.13)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
rake (10.0.4)
rdoc (3.12.2)
json (~> 1.4)
rubyzip (0.9.9)
selenium-webdriver (2.32.1)
childprocess (>= 0.2.5)
multi_json (~> 1.0)
rubyzip
websocket (~> 1.0.4)
sprockets (2.2.2)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
thor (0.18.1)
tilt (1.3.7)
websocket (1.0.7)
xpath (0.1.4)
nokogiri (~> 1.3)

PLATFORMS
ruby

DEPENDENCIES
activesupport (~> 3.2.13)
ae_page_objects!
appraisal (~> 0.5.1)
mocha (= 0.13.3)
railties (~> 3.2.13)
selenium-webdriver
10 changes: 10 additions & 0 deletions lib/ae_page_objects/element_proxy.rb
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,16 @@ def visible?
!!presence.try(:visible?)
end

def not_visible?
Capybara.current_session.wait_until do
Capybara.using_wait_time(0) do
! visible?
end
end
rescue Capybara::TimeoutError
false
end

def present?
presence.present?
end
Expand Down
4 changes: 0 additions & 4 deletions test/test_apps/3.0/.gitignore

This file was deleted.

Loading