wist 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4bf236ea011dd9f5516b6c63199ca7ef297408c
-  data.tar.gz: 8d9410908f0b97f4a977be403059529a686a8616
+  metadata.gz: 92c7a729771ad5443f5138500cf840ee4e95d3e9
+  data.tar.gz: 64e03b847b5957264cf8c494d85506102f67ee51
 SHA512:
-  metadata.gz: 0343ebdfc764ebc62de5cf1aacecefdf839c8ae39f2a4437358d164ca193e6bdccded05c26bafc4f8412b7798772ce5058f87eff188a90454f69f6264496108c
-  data.tar.gz: 4ab8dfaa022e7f5803151a064d66b915aac1cbb2d328fe45f4ade721c3753a3812cbb31ae196d2f16f9ebec43f7d00b726ffa0ac143c3a61fa07be2a30bb1ff3
+  metadata.gz: 66ba3eaa0f21c10b9b191eda29e9894ef5a0f31731721146bfd06e63461957b7f8504004ef7e7dbabab730c91a9e541c8a63bc50c761e19e6eda2cb51e37b057
+  data.tar.gz: 9c9b800713baedad2fbe8924392fdff34514ff1dfe187e98b5e84abd8415295f4108c082ca4ca622366693757846c461fc73cc43314a08fce9c59778edffb75f

data/Gemfile

@@ -2,8 +2,7 @@ source 'http://rubygems.org/'
 gemspec
 
 gem 'capybara', '2.2.1'
-gem 'tconsole', github: 'lihanli/tconsole'
 gem 'pry'
-gem 'turn'
 gem 'rake'
-gem "poltergeist", "1.5.0"
+gem "poltergeist", "1.5.1"
+gem 'minitest-reporters'

data/Gemfile.lock

@@ -1,15 +1,7 @@
-GIT
-  remote: git://github.com/lihanli/tconsole.git
-  revision: fbc06123705a72d5b5c4509d7d471262cf68c170
-  specs:
-    tconsole (1.3.0.pre2)
-      chattyproc (~> 1.0.0)
-      term-ansicolor (~> 1.0.7)
-
 PATH
   remote: .
   specs:
-    wist (0.2.3)
+    wist (0.2.4)
       capybara
       selenium-webdriver
 
@@ -17,25 +9,31 @@ GEM
   remote: http://rubygems.org/
   specs:
     ansi (1.4.3)
+    builder (3.2.2)
     capybara (2.2.1)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    chattyproc (1.0.0)
-    childprocess (0.5.3)
+    childprocess (0.5.5)
       ffi (~> 1.0, >= 1.0.11)
     cliver (0.3.2)
     coderay (1.0.9)
-    ffi (1.9.3)
+    ffi (1.9.6)
     method_source (0.8.2)
     mime-types (2.2)
     mini_portile (0.5.3)
+    minitest (5.4.3)
+    minitest-reporters (1.0.7)
+      ansi
+      builder
+      minitest (>= 5.0)
+      ruby-progressbar
     multi_json (1.9.2)
     nokogiri (1.6.1)
       mini_portile (~> 0.5.0)
-    poltergeist (1.5.0)
+    poltergeist (1.5.1)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
       multi_json (~> 1.0)
@@ -48,18 +46,16 @@ GEM
     rack-test (0.6.2)
       rack (>= 1.0)
     rake (10.1.0)
-    rubyzip (1.1.4)
-    selenium-webdriver (2.42.0)
-      childprocess (>= 0.5.0)
+    ruby-progressbar (1.7.0)
+    rubyzip (1.1.6)
+    selenium-webdriver (2.43.0)
+      childprocess (~> 0.5)
       multi_json (~> 1.0)
       rubyzip (~> 1.0)
-      websocket (~> 1.0.4)
+      websocket (~> 1.0)
     slop (3.4.6)
-    term-ansicolor (1.0.7)
-    turn (0.9.6)
-      ansi
-    websocket (1.0.7)
-    websocket-driver (0.3.2)
+    websocket (1.2.1)
+    websocket-driver (0.4.0)
     xpath (2.0.0)
       nokogiri (~> 1.3)
 
@@ -68,9 +64,8 @@ PLATFORMS
 
 DEPENDENCIES
   capybara (= 2.2.1)
-  poltergeist (= 1.5.0)
+  minitest-reporters
+  poltergeist (= 1.5.1)
   pry
   rake
-  tconsole!
-  turn
   wist!

data/lib/wist.rb

@@ -7,6 +7,11 @@ module Wist
     Capybara::Selenium::Driver.new(app, browser: :chrome)
   end
 
+  class << self
+    attr_accessor(:rspec)
+  end
+  self.rspec = defined?(RSpec)
+
   module Helpers
     module_function
 
@@ -15,6 +20,14 @@ module Wist
     end
   end
 
+  def wist_assert(value, expected)
+    if Wist.rspec
+      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
@@ -46,7 +59,7 @@ module Wist
   def verify_tweet_button(text)
     share_button_src = nil
     wait_until { share_button_src = find('.twitter-share-button')[:src] }
-    assert_equal text, CGI.parse(URI.parse(share_button_src.gsub('#', '?')).query)['text'][0]
+    wist_assert(CGI.parse(URI.parse(share_button_src.gsub('#', '?')).query)['text'][0], text)
   end
 
   def driver
@@ -64,7 +77,7 @@ module Wist
   def alert_accept(expected_msg = false)
     page.execute_script "window.alert = function(msg) { window.lastAlertMsg = msg; }"
     yield
-    assert_equal(expected_msg, get_js('window.lastAlertMsg')) if expected_msg
+    wist_assert(get_js('window.lastAlertMsg'), expected_msg) if expected_msg
   end
 
   def get_js(code)
@@ -143,11 +156,11 @@ module Wist
   end
 
   def assert_text(text, el)
-    assert_equal(text, el.text)
+    wist_assert(el.text, text)
   end
 
   def assert_text_include(text, el)
-    assert_equal(true, el.text.include?(text))
+    wist_assert(el.text.include?(text), true)
   end
 
   def parent(el)
@@ -162,8 +175,9 @@ module Wist
   end
 
   %w(has has_no).each do |prefix|
-    define_method("assert_#{prefix}_css") do |*args|
-      assert_equal(true, send("#{prefix}_css?", *args))
+    define_method("assert_#{prefix}_css") do |selector, opt = {}|
+      opt[:visible] = true if opt[:visible].nil?
+      wist_assert(send("#{prefix}_css?", selector, opt), true)
     end
   end
 

data/test/test_helper.rb

@@ -1,10 +1,11 @@
 require 'wist'
 require 'capybara/poltergeist'
 require 'pry'
-begin; require 'turn/autorun'; rescue LoadError; end
-Turn.config.format = :dot
+require "minitest/autorun"
+require "minitest/reporters"
+Minitest::Reporters.use!
 
-class CapybaraTestCase < Test::Unit::TestCase
+class CapybaraTestCase < Minitest::Test
   include Capybara::DSL
   include Wist
 

data/test/tests/wist_test.rb

@@ -174,7 +174,7 @@ class WistTest < CapybaraTestCase
   end
 
   def test_assert_css
-    assert_has_css('#click_test', visible: true)
+    assert_has_css('#click_test')
     assert_has_no_css('#dog123')
   end
 

data/wist.gemspec

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

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: wist
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Lihan Li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-11 00:00:00.000000000 Z
+date: 2014-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
   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'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   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: 
@@ -44,7 +44,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - MIT-LICENSE
@@ -70,17 +70,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: capybara helpers