wist 0.0.5 → 0.0.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: bb6a402a82ccab3effa69cea5c049681cbb10ed4
+  data.tar.gz: 26eaa1f4a52135ac50200c19683a5e1d3ae46d8c
+SHA512:
+  metadata.gz: 5332a3666e05912139c939ebfdadb3968556a2b29a8e0e30ace07928e70f60c54e4d367c954fcf38598d4552cc44c8a418381a224410097f038e928bce63ebeb
+  data.tar.gz: e855d76233d1334a23651c7455449a92cade9c7b6e4f773dcaf57ace370b0d4817c5d69d51cac51c1d2489f74873e467295584792d79509d6fd9e2b9ceed2e42

data/Gemfile

@@ -1,9 +1,9 @@
 source 'http://rubygems.org/'
 gemspec
 
-gem 'capybara', '2.0.2'
+gem 'capybara', '2.0.3'
 gem 'tconsole'
 gem 'pry'
 gem 'turn'
 gem 'rake'
-gem 'poltergeist', git: 'git://github.com/jonleighton/poltergeist.git'
+gem "poltergeist", "1.1.0"

data/Gemfile.lock

@@ -1,60 +1,51 @@
-GIT
-  remote: git://github.com/jonleighton/poltergeist.git
-  revision: 98d4a4a8936e8d6b3417f2c057bafaba40874eee
-  specs:
-    poltergeist (1.0.2)
-      capybara (~> 2.0, >= 2.0.1)
-      faye-websocket (~> 0.4, >= 0.4.4)
-      http_parser.rb (~> 0.5.3)
-
 PATH
   remote: .
   specs:
-    wist (0.0.4)
+    wist (0.0.6)
       capybara
 
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.3.2)
     ansi (1.4.3)
-    capybara (2.0.2)
+    capybara (2.0.3)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
       xpath (~> 1.0.0)
-    childprocess (0.3.6)
-      ffi (~> 1.0, >= 1.0.6)
+    childprocess (0.3.9)
+      ffi (~> 1.0, >= 1.0.11)
     coderay (1.0.8)
-    eventmachine (1.0.0)
-    faye-websocket (0.4.6)
+    eventmachine (1.0.1)
+    faye-websocket (0.4.7)
       eventmachine (>= 0.12.0)
-    ffi (1.3.1)
+    ffi (1.6.0)
     http_parser.rb (0.5.3)
-    libwebsocket (0.1.7.1)
-      addressable
-      websocket
     method_source (0.8.1)
-    mime-types (1.19)
+    mime-types (1.21)
     minitest (4.3.3)
-    multi_json (1.5.0)
-    nokogiri (1.5.6)
+    multi_json (1.7.2)
+    nokogiri (1.5.9)
+    poltergeist (1.1.0)
+      capybara (~> 2.0, >= 2.0.1)
+      faye-websocket (~> 0.4, >= 0.4.4)
+      http_parser.rb (~> 0.5.3)
     pry (0.9.10)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.3.1)
-    rack (1.4.4)
+    rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
     rake (10.0.3)
     rubyzip (0.9.9)
-    selenium-webdriver (2.27.2)
+    selenium-webdriver (2.31.0)
       childprocess (>= 0.2.5)
-      libwebsocket (~> 0.1.3)
       multi_json (~> 1.0)
       rubyzip
+      websocket (~> 1.0.4)
     slop (3.3.3)
     tconsole (1.2.7)
       minitest (~> 4.3.0)
@@ -62,7 +53,7 @@ GEM
     term-ansicolor (1.0.7)
     turn (0.9.6)
       ansi
-    websocket (1.0.6)
+    websocket (1.0.7)
     xpath (1.0.0)
       nokogiri (~> 1.3)
 
@@ -70,8 +61,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  capybara (= 2.0.2)
-  poltergeist!
+  capybara (= 2.0.3)
+  poltergeist (= 1.1.0)
   pry
   rake
   tconsole

data/lib/wist.rb

@@ -8,8 +8,14 @@ module Wist
     end
   end
 
-  def wait_until(&block)
-    Selenium::WebDriver::Wait.new(timeout: defined?(@wait) ? @wait : 20).until &block
+  def wait_until
+    Selenium::WebDriver::Wait.new(timeout: defined?(@wait) ? @wait : 20).until do
+      begin
+        yield
+      rescue
+        false
+      end
+    end
   end
 
   def click(selector)
@@ -61,8 +67,7 @@ module Wist
   end
 
   def get_val(selector)
-    find(selector)
-    get_js "#{jquery_selector selector}.val()"
+    find(selector).value
   end
 
   def set_input_and_press_enter(selector, val)
@@ -85,21 +90,16 @@ module Wist
     visit current_url
   end
 
-  def element_displayed?(selector)
-    find(selector).visible?
-  end
-
   def wait_for_ajax
     wait_until { get_js '$.isReady && ($.active == 0)' }
   end
 
   def wait_til_element_visible(selector)
-    el = nil
-    wait_until do
-      el = find(selector)
-      el.visible?
-    end
-    el
+    has_css?(selector, visible: true)
+    find(selector)
   end
 
+  def scroll_to(selector)
+    page.execute_script("#{jquery_selector('html, body')}.scrollTop(#{jquery_selector(selector)}.offset().top)")
+  end
 end

data/test/test.css

@@ -0,0 +1,3 @@
+#test_scroll_to {
+  margin-top: 1000px;
+}

data/test/test0.html

@@ -1,12 +1,13 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <link rel='stylesheet' type='text/css' href='test.css'>
   </head>
   <body>
     <button id='click_test'>foo</button>
     <button id='wait_test'>foo</button>
     <button id='enable_tweet_button'>foo</button>
-    <a href="https://twitter.com/share" class="twitter-share-button" data-text='check this out'></a>
+    <a href='https://twitter.com/share' class='twitter-share-button' data-text='check this out'></a>
     <a id='switch_window_test' href='test1.html' target='_blank'>foo</a>
     <input id='input_test' type='text' />
 
@@ -23,8 +24,10 @@
 
     <input id='test_set_input_and_press_enter' type='text' />
 
-    <script src="jquery.js"></script>
-    <script src="jquery.cookie.js"></script>
-    <script src="test.js"></script>
+    <div id='test_scroll_to'></div>
+
+    <script src='jquery.js'></script>
+    <script src='jquery.cookie.js'></script>
+    <script src='test.js'></script>
   </body>
 </html>

data/test/test_helper.rb

@@ -16,6 +16,5 @@ class CapybaraTestCase < Test::Unit::TestCase
 
   def teardown
     Capybara.reset_sessions!
-    Capybara.use_default_driver
   end
 end

data/test/tests/wist_test.rb

@@ -20,7 +20,11 @@ class WistTest < CapybaraTestCase
     button = find('#wait_test')
     button.click
     assert button.text != 'clicked'
-    wait_until { button.text == 'clicked' }
+
+    wait_until do
+      raise unless button.text == 'clicked'
+      true
+    end
   end
 
   def test_verify_tweet_button
@@ -73,11 +77,6 @@ class WistTest < CapybaraTestCase
     assert_equal '', get_val('#input_test')
   end
 
-  def test_element_displayed?
-    assert_equal false, element_displayed?('#invisible')
-    assert element_displayed?('#input_test')
-  end
-
   def test_wait_til_element_visible
     el = find('#test_wait_til_element_visible')
     el.click
@@ -103,4 +102,10 @@ class WistTest < CapybaraTestCase
     end
     assert_equal('bar', get_val('#test_set_input_and_press_enter'))
   end
+
+  def test_scroll_to
+    old_offset = get_js('window.pageYOffset')
+    scroll_to('#test_scroll_to')
+    assert_equal(true, get_js('window.pageYOffset') != old_offset)
+  end
 end

data/wist.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name     = 'wist'
-  gem.version  = '0.0.5'
+  gem.version  = '0.0.6'
   gem.summary  = 'capybara helpers'
   gem.author   = 'Lihan Li'
   gem.email    = 'frankieteardrop@gmail.com'

metadata

@@ -1,30 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: wist
 version: !ruby/object:Gem::Version
-  version: 0.0.5
-  prerelease: 
+  version: 0.0.6
 platform: ruby
 authors:
 - Lihan Li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-05 00:00:00.000000000 Z
+date: 2013-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -42,6 +39,7 @@ files:
 - lib/wist.rb
 - test/jquery.cookie.js
 - test/jquery.js
+- test/test.css
 - test/test.js
 - test/test0.html
 - test/test1.html
@@ -50,31 +48,31 @@ files:
 - wist.gemspec
 homepage: http://github.com/lihanli/wist
 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'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: capybara helpers
 test_files:
 - test/jquery.cookie.js
 - test/jquery.js
+- test/test.css
 - test/test.js
 - test/test0.html
 - test/test1.html