wist 0.3.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4aa5f441eb74f8fae874d4e3493410d32fdb11a1
-  data.tar.gz: eea7f1657d43671176f1ce373daf62f0742d190e
+SHA256:
+  metadata.gz: f50d2a4e813ee0d298dfd8c1bc146178d502100547924ce6c98c87d86f689efe
+  data.tar.gz: 479e8e67c13dc4c3f008e0300bdc9b1cc64b1fab8a8b8dc6cd5ea989b0bf9705
 SHA512:
-  metadata.gz: 565621550f29574538d051cbf9176682894b97a1379fc54914cdf26eb8a694bf856e49fdb28b7873346516163c595b22fd5505a7a0eba85ba0b6b611db3ddffb
-  data.tar.gz: 18b403d2a1634b5beb53e6bd54cda75ef42842ac2e4e6ddc740604f5467e14ae12e4bccfcb88dff8ecf7e06c9b512bc20e4c2a6c78532323f6ef365656a809e4
+  metadata.gz: fe381784ced54fa784608bba42ff0ed9fe38f85ff52e06916f5e1314c059ebffe7f4e01e44aca1fed743e2ff0d31e4152b11a386e45344a391effd86ed128775
+  data.tar.gz: 314c75cbb6cc1265fbaa9160d96cd0b334211928d483b14ff5bb2b694a6bfc817363491bf4b779406bf08ac97cf041d2bf59acc01256c39c6af05ef959d512d4

data/Gemfile

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

data/Gemfile.lock

@@ -1,71 +1,72 @@
 PATH
   remote: .
   specs:
-    wist (0.3.1)
+    wist (0.6.0)
       capybara
+      common_assert
       selenium-webdriver
 
 GEM
   remote: http://rubygems.org/
   specs:
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
     ansi (1.5.0)
     builder (3.2.2)
-    capybara (2.4.4)
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (~> 2.0)
-    childprocess (0.5.6)
-      ffi (~> 1.0, >= 1.0.11)
-    cliver (0.3.2)
-    coderay (1.0.9)
-    ffi (1.9.10)
-    method_source (0.8.2)
-    mime-types (2.4.3)
-    mini_portile (0.6.2)
+    capybara (3.36.0)
+      addressable
+      matrix
+      mini_mime (>= 0.1.3)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      regexp_parser (>= 1.5, < 3.0)
+      xpath (~> 3.2)
+    childprocess (4.1.0)
+    coderay (1.1.2)
+    common_assert (0.0.1)
+    matrix (0.4.2)
+    method_source (0.9.2)
+    mini_mime (1.1.2)
+    mini_portile2 (2.7.1)
     minitest (5.5.1)
     minitest-reporters (1.0.11)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    multi_json (1.9.2)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
-    poltergeist (1.5.1)
-      capybara (~> 2.1)
-      cliver (~> 0.3.1)
-      multi_json (~> 1.0)
-      websocket-driver (>= 0.2.0)
-    pry (0.9.12.2)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    rack (1.6.0)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rake (10.1.0)
+    nokogiri (1.13.1)
+      mini_portile2 (~> 2.7.0)
+      racc (~> 1.4)
+    pry (0.12.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    public_suffix (4.0.6)
+    racc (1.6.0)
+    rack (2.2.3)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rake (13.0.6)
+    regexp_parser (2.2.0)
+    rexml (3.2.5)
     ruby-progressbar (1.7.1)
-    rubyzip (1.1.7)
-    selenium-webdriver (2.46.2)
-      childprocess (~> 0.5)
-      multi_json (~> 1.0)
-      rubyzip (~> 1.0)
-      websocket (~> 1.0)
-    slop (3.4.6)
-    websocket (1.2.2)
-    websocket-driver (0.4.0)
-    xpath (2.0.0)
-      nokogiri (~> 1.3)
+    rubyzip (2.3.2)
+    selenium-webdriver (4.1.0)
+      childprocess (>= 0.5, < 5.0)
+      rexml (~> 3.2, >= 3.2.5)
+      rubyzip (>= 1.2.2)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  capybara (= 2.4.4)
+  capybara (= 3.36.0)
   minitest-reporters
-  poltergeist (= 1.5.1)
   pry
   rake
   wist!
+
+BUNDLED WITH
+   2.3.5

data/Rakefile

@@ -6,9 +6,7 @@ Rake::TestTask.new('test') do |t|
 end
 
 task 'test:all' do
-  Rake::Task['test'].execute
-
-  %w(chrome poltergeist).each do |browser|
+  %w(selenium_chrome_headless).each do |browser|
     ENV['BROWSER'] = browser
     Rake::Task['test'].execute
   end
@@ -19,4 +17,4 @@ task :build do
   `rm -rf build`
   `mkdir build`
   `mv *.gem build`
-end
+end

data/lib/wist.rb

@@ -2,51 +2,34 @@ module Wist
   require 'selenium-webdriver'
   require 'cgi'
   require 'capybara'
+  require 'common_assert'
+
+  def self.included(klass)
+    klass.include CommonAssert
+  end
 
   Capybara.register_driver :chrome do |app|
     Capybara::Selenium::Driver.new(app, browser: :chrome)
   end
 
   class << self
-    attr_accessor(:rspec_should)
-    attr_accessor(:rspec_expect)
-    attr_accessor(:assert_syntax_detected)
+    attr_accessor(:wait_time_method)
+  end
+
+  self.wait_time_method = if defined?(Capybara.default_max_wait_time)
+    :default_max_wait_time
+  else
+    :default_wait_time
   end
 
   module Helpers
     module_function
 
-    def detect_assert_syntax
-      return if Wist.assert_syntax_detected
-
-      if defined?(RSpec)
-        if RSpec.configuration.expect_with[0].configuration.syntax.include?(:expect)
-          Wist.rspec_expect = true
-        else
-          Wist.rspec_should = true
-        end
-      end
-
-      Wist.assert_syntax_detected = true
-    end
-
     def blank?(obj)
       obj.respond_to?(:empty?) ? obj.empty? : !obj
     end
   end
 
-  def wist_assert(value, expected)
-    Helpers.detect_assert_syntax
-
-    if Wist.rspec_expect
-      expect(value).to eq(expected)
-    elsif Wist.rspec_should
-      value.should == expected
-    else
-      assert_equal(expected, value)
-    end
-  end
-
   def wait_until(timeout: false)
     do_instantly do
       Selenium::WebDriver::Wait.new(timeout: timeout || @old_wait_time).until do
@@ -59,15 +42,8 @@ module Wist
     end
   end
 
-  def click(*args)
-    find(*args).click
-  end
-
-  def set_cookie(k, v)
-    page.execute_script <<-eos
-      (function (e,t,n){var r=new Date;r.setDate(r.getDate()+n);var i=escape(t)+(n==null?"":"; expires="+r.toUTCString());document.cookie=e+"="+i}
-      (#{k.to_json}, #{v.to_json}));
-    eos
+  def click(...)
+    find(...).click
   end
 
   def set_value_and_trigger_evts(selector, val)
@@ -78,7 +54,7 @@ module Wist
   def verify_tweet_button(text)
     share_button_src = nil
     wait_until { share_button_src = find('.twitter-share-button')[:src] }
-    wist_assert(CGI.parse(URI.parse(share_button_src.gsub('#', '?')).query)['text'][0], text)
+    common_assert_equal(CGI.parse(URI.parse(share_button_src.gsub('#', '?')).query)['text'][0], text)
   end
 
   def driver
@@ -167,32 +143,18 @@ module Wist
   end
 
   %w(first all).each do |finder|
-    define_method("#{finder}_with_wait") do |*args|
-      has_css?(*args)
-      send(finder.to_sym, *args)
-    end
-  end
-
-  def visit_with_retries(url, retries: 5, wait_time: 10)
-    raise 'only works with poltergeist' unless Capybara.javascript_driver == :poltergeist
-    status = nil
-
-    retries.times do |i|
-      status = visit(url)['status']
-      break if status == 'success'
-      puts "visiting #{url} failed, attempting retry #{i + 1}/#{retries} in #{wait_time} second(s)"
-      sleep wait_time
+    define_method("#{finder}_with_wait") do |*args, **kwargs|
+      has_css?(*args, **kwargs)
+      send(finder.to_sym, *args, **kwargs)
     end
-
-    raise "visit #{url} failed" unless status == 'success'
   end
 
   def assert_text(text, el_or_selector)
-    wist_assert(process_el_or_selector(el_or_selector).text, text)
+    common_assert_equal(process_el_or_selector(el_or_selector).text, text)
   end
 
   def assert_text_include(text, el)
-    wist_assert(el.text.include?(text), true)
+    common_assert_equal(el.text.include?(text), true)
   end
 
   def parent(el)
@@ -209,31 +171,35 @@ module Wist
   %w(has has_no).each do |prefix|
     define_method("assert_#{prefix}_css") do |selector, opt = {}|
       opt[:visible] = true if opt[:visible].nil?
-      wist_assert(send("#{prefix}_css?", selector, opt), true)
+      common_assert_equal(send("#{prefix}_css?", selector, **opt), true)
     end
   end
 
-  def has_css_instant?(*args)
-    do_instantly { has_css?(*args) }
+  def has_css_instant?(...)
+    do_instantly { has_css?(...) }
+  end
+
+  def get_capybara_wait_time
+    Capybara.public_send(Wist.wait_time_method)
   end
 
   def do_instantly
     lambda do
-      default_wait_time = Capybara.default_wait_time
-      @old_wait_time = default_wait_time if default_wait_time > 0
+      default_max_wait_time = get_capybara_wait_time
+      @old_wait_time = default_max_wait_time if default_max_wait_time > 0
     end.()
-    Capybara.default_wait_time = 0
+    Capybara.public_send("#{Wist.wait_time_method}=", 0)
 
     begin
       yield
     rescue => e
       raise(e)
     ensure
-      Capybara.default_wait_time = @old_wait_time
+      Capybara.public_send("#{Wist.wait_time_method}=", @old_wait_time)
     end
   end
 
   def assert_el_has_link(selector, link)
-    wist_assert(get_js("$('#{selector}').attr('href')"), link)
+    common_assert_equal(get_js("$('#{selector}').attr('href')"), link)
   end
 end

data/test/test_helper.rb

@@ -1,8 +1,8 @@
 require 'wist'
-require 'capybara/poltergeist'
 require 'pry'
 require "minitest/autorun"
 require "minitest/reporters"
+require 'capybara/minitest'
 Minitest::Reporters.use!(Minitest::Reporters::SpecReporter.new)
 
 class CapybaraTestCase < Minitest::Test
@@ -17,4 +17,4 @@ class CapybaraTestCase < Minitest::Test
   def teardown
     Capybara.reset_sessions!
   end
-end
+end

data/test/tests/wist_test.rb

@@ -39,7 +39,7 @@ class WistTest < CapybaraTestCase
 
     wait_until(&wait_until_test(button))
     # make sure default wait time is back to normal
-    assert_equal(2, Capybara.default_wait_time)
+    assert_equal(2, get_capybara_wait_time)
   end
 
   def test_verify_tweet_button
@@ -126,12 +126,6 @@ class WistTest < CapybaraTestCase
     assert_equal('changed', get_val('#test_set_value_and_trigger_evts'))
   end
 
-  def test_set_cookie
-    return if Capybara.javascript_driver == :chrome
-    set_cookie('foo', 'bar')
-    assert_equal('bar', page.evaluate_script("$.cookie('foo')"))
-  end
-
   def test_set_input_and_press_enter
     alert_accept('enter pressed') do
       set_input_and_press_enter('#test_set_input_and_press_enter', 'bar')
@@ -154,17 +148,6 @@ class WistTest < CapybaraTestCase
     assert_equal('finder_with_wait', all_with_wait('.done', visible: true)[0][:id])
   end
 
-  def test_visit_with_retries
-    return unless Capybara.javascript_driver == :poltergeist
-
-    assert_raise RuntimeError do
-      visit_with_retries('a.bc', retries: 2, wait_time: 1)
-    end
-
-    visit_with_retries("file://#{Dir.pwd}/test/test0.html")
-    verify_test_page(0)
-  end
-
   def test_assert_text
     assert_text('foo', find('#click_test'))
   end
@@ -193,19 +176,19 @@ class WistTest < CapybaraTestCase
   end
 
   def test_do_instantly
-    old_time = Capybara.default_wait_time
+    old_time = get_capybara_wait_time
     new_time = nil
 
     begin
       do_instantly do
-        new_time = Capybara.default_wait_time
+        new_time = get_capybara_wait_time
         raise
       end
     rescue
     end
 
     assert_equal(0, new_time)
-    assert_equal(old_time, Capybara.default_wait_time)
+    assert_equal(old_time, get_capybara_wait_time)
   end
 
   def test_interact_with_confirm

data/wist.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name     = 'wist'
-  gem.version  = '0.3.1'
+  gem.version  = '0.6.0'
   gem.summary  = 'capybara helpers'
   gem.author   = 'Lihan Li'
   gem.email    = 'frankieteardrop@gmail.com'
@@ -9,6 +9,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'capybara'
   gem.add_dependency 'selenium-webdriver'
+  gem.add_dependency 'common_assert'
 
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wist
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Lihan Li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-07 00:00:00.000000000 Z
+date: 2022-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: common_assert
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: frankieteardrop@gmail.com
 executables: []
@@ -79,17 +93,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 3.2.32
 signing_key: 
 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
-- test/test_helper.rb
-- test/tests/wist_test.rb
+test_files: []