wist 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10cca54a428e9d773cbae796707143783b12243b
-  data.tar.gz: 32c6af1c6f59d2728fc5432a96733ab171aca930
+  metadata.gz: 5d442dba7a20cc94dc952134c42fddae437ac2ef
+  data.tar.gz: e06f2b1593e82481e546b8b822a27ff13ae3f1ee
 SHA512:
-  metadata.gz: 9b918cd234dfd215ff897054d2e492fec8cd4e665d4bebf385e5fda7dcc4e9c1d20c33c94256561ec785c861655393d510dd7a6ec1ee63a7e48a7630a668f6d3
-  data.tar.gz: ca47d1828c1a1d5754e13a593d4f9e6aa2b1d685cc6bd8a951ecf87528ca169e3b859de75a6d70f8060b9b081e0e8fb23c6d594738c8eb8b42f613876f896d9d
+  metadata.gz: 89087afabf8ac0fb7523a910cbe45c5a97680caf4223a263df9a2b225414000a7fa449d27407696ca03be3903b4e33467b84b615482b74083fe657870ea42382
+  data.tar.gz: adb31d3a1ce95a42349abcc7f262127555d401ab8285adf215fd23433d6bfa7aec31dfe96e9fc38b251c816cac6bfeac4ac7d610a30701be0d92eded6816320e

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    wist (0.4.0)
+    wist (0.4.1)
       capybara
+      common_assert
       selenium-webdriver
 
 GEM
@@ -20,6 +21,7 @@ GEM
       ffi (~> 1.0, >= 1.0.11)
     cliver (0.3.2)
     coderay (1.0.9)
+    common_assert (0.0.1)
     ffi (1.9.10)
     method_source (0.8.2)
     mime-types (2.6.2)
@@ -48,7 +50,7 @@ GEM
     rake (10.1.0)
     ruby-progressbar (1.7.1)
     rubyzip (1.1.7)
-    selenium-webdriver (2.47.1)
+    selenium-webdriver (2.48.1)
       childprocess (~> 0.5)
       multi_json (~> 1.0)
       rubyzip (~> 1.0)
@@ -69,3 +71,6 @@ DEPENDENCIES
   pry
   rake
   wist!
+
+BUNDLED WITH
+   1.10.6

data/lib/wist.rb

@@ -2,15 +2,17 @@ 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
 
@@ -20,41 +22,14 @@ module Wist
     :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
@@ -86,7 +61,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
@@ -196,11 +171,11 @@ module Wist
   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)
@@ -217,7 +192,7 @@ 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
 
@@ -246,6 +221,6 @@ module Wist
   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/wist.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name     = 'wist'
-  gem.version  = '0.4.0'
+  gem.version  = '0.4.1'
   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.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Lihan Li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-07 00:00:00.000000000 Z
+date: 2015-10-21 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: []
@@ -80,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: capybara helpers