wist 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 450acc6d356d059a6c0c198eb1b4127c2fb22783
-  data.tar.gz: 5e628c0c47dbd85e06875703cfacf2b4fe8721f4
+  metadata.gz: eb0235c7168ac2bd0d0bc5c741326a2b89352369
+  data.tar.gz: 1bd1d3788f70bfc7761cb168dd49ababc62544b5
 SHA512:
-  metadata.gz: 951913b7641ab65c9dcee97dddf2c08ca63230d3f2768f287f3979a6c5207be48f5d0974b6051c919264438163e77466b439dcd8d404c52af92000c0dcdd775d
-  data.tar.gz: 783a628c708798679e09004dffafa52c8cc18970ddbbfcdd686533237154eaa3f78d351377eaa0fc56f7b365ee5f755cf4f785f4dc6c72b3b08d23b2bac9f428
+  metadata.gz: 52070d633534d45594a25e2e02d4ab1fd4875026c326cf9e64e06a530be1abdf6ab14024ae03c2358e586f0a1c8c4473e438df1f49e575a9b1f79595813a1981
+  data.tar.gz: 83e60bab0ce9bb9c443c47c6f6889135f0d53a60fcbb06e76624300a5c695f83e35390791601c1db4aef2ab3d082fe6b9df93b93758313cc2bee470eedca82e6

data/Gemfile

@@ -1,7 +1,7 @@
 source 'http://rubygems.org/'
 gemspec
 
-gem 'capybara', '2.2.1'
+gem 'capybara', '2.4.4'
 gem 'pry'
 gem 'rake'
 gem "poltergeist", "1.5.1"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    wist (0.2.5)
+    wist (0.2.6)
       capybara
       selenium-webdriver
 
@@ -10,7 +10,7 @@ GEM
   specs:
     ansi (1.5.0)
     builder (3.2.2)
-    capybara (2.2.1)
+    capybara (2.4.4)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
@@ -22,8 +22,8 @@ GEM
     coderay (1.0.9)
     ffi (1.9.6)
     method_source (0.8.2)
-    mime-types (2.2)
-    mini_portile (0.5.3)
+    mime-types (2.4.3)
+    mini_portile (0.6.2)
     minitest (5.5.1)
     minitest-reporters (1.0.11)
       ansi
@@ -31,8 +31,8 @@ GEM
       minitest (>= 5.0)
       ruby-progressbar
     multi_json (1.9.2)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
     poltergeist (1.5.1)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
@@ -42,8 +42,8 @@ GEM
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
-    rack (1.5.2)
-    rack-test (0.6.2)
+    rack (1.6.0)
+    rack-test (0.6.3)
       rack (>= 1.0)
     rake (10.1.0)
     ruby-progressbar (1.7.1)
@@ -63,7 +63,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  capybara (= 2.2.1)
+  capybara (= 2.4.4)
   minitest-reporters
   poltergeist (= 1.5.1)
   pry

data/lib/wist.rb

@@ -66,9 +66,8 @@ module Wist
     page.driver.browser
   end
 
-  def switch_to_window_and_execute
-    wait_until { driver.window_handles.size == 2 }
-    within_window(driver.window_handles.last) do
+  def switch_to_window_and_execute(new_window_lambda)
+    within_window(window_opened_by(&new_window_lambda)) do
       yield
       driver.close
     end
@@ -204,4 +203,8 @@ module Wist
       Capybara.default_wait_time = @old_wait_time
     end
   end
+
+  def assert_el_has_link(selector, link)
+    wist_assert(get_js("$('#{selector}').attr('href')"), link)
+  end
 end

data/test/tests/wist_test.rb

@@ -49,14 +49,19 @@ class WistTest < CapybaraTestCase
 
   def test_switch_to_window_and_execute
     return if Capybara.javascript_driver == :poltergeist
-    verify_test_page 0
-    click '#switch_window_test'
+    assert_num_windows = lambda do |num|
+      assert_equal(num, page.driver.browser.window_handles.size)
+    end
+
+    verify_test_page(0)
 
-    switch_to_window_and_execute do
-      verify_test_page 1
+    switch_to_window_and_execute(-> { click('#switch_window_test') }) do
+      verify_test_page(1)
+      assert_num_windows.(2)
     end
 
-    verify_test_page 0
+    assert_num_windows.(1)
+    verify_test_page(0)
   end
 
   def test_get_js
@@ -206,4 +211,12 @@ class WistTest < CapybaraTestCase
       assert_equal(bool, get_js('confirmed'))
     end
   end
+
+  def test_assert_el_has_link
+    assert_el_has_link('#switch_window_test', 'test1.html')
+
+    assert_raises(Minitest::Assertion) do
+      assert_el_has_link('#switch_window_test', 'foo')
+    end
+  end
 end

data/wist.gemspec

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wist
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Lihan Li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-17 00:00:00.000000000 Z
+date: 2015-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara