wist 0.2.7 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c370b625a15f8f6afbdfb14fc5f30dc580bd27c
-  data.tar.gz: dd781fd9a951314e8d8ad1f8bac9d1a7807a0648
+  metadata.gz: 3112671f26405f4c839b28cef0a2b6f7c6eb8f48
+  data.tar.gz: 8a8174b542d4fd09d73d28300af07dabd8ddd999
 SHA512:
-  metadata.gz: abfe05c4100a3dea36b3fe706ae7aa93ec2895ad276f9a9273fb0cbbed15829265070d91fc3db5de7ad9fb6101d93a54439978a80c64c376eb9c77f1acfe6365
-  data.tar.gz: 41100526e16041085290d7f20bd865ea0e8bbbf777ccec7f03f923c8ca5031921ef4a4fc8914bc22e66b61b242c7772a70dbbc95a4363d12a0b595c4abeb7780
+  metadata.gz: cc2f1d98dea77c4025989044ba114b19d96deeda8134c130877e012497f2d0a5f3f6f864fdccba937edb13ee5eaaf434939872b8a426e8b4f18f7b7cd0fe0d58
+  data.tar.gz: f6003c1fd3892a3e8e0854ab1be25ac1872b70d3adbb4407cbff7d51f30a1125d2ce3c4d577308c07ce49f5b3ba0d14442c9582f72b5c3d58d70f67a07afacbb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    wist (0.2.7)
+    wist (0.3.0)
       capybara
       selenium-webdriver
 
@@ -16,11 +16,11 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    childprocess (0.5.5)
+    childprocess (0.5.6)
       ffi (~> 1.0, >= 1.0.11)
     cliver (0.3.2)
     coderay (1.0.9)
-    ffi (1.9.8)
+    ffi (1.9.10)
     method_source (0.8.2)
     mime-types (2.4.3)
     mini_portile (0.6.2)
@@ -48,13 +48,13 @@ GEM
     rake (10.1.0)
     ruby-progressbar (1.7.1)
     rubyzip (1.1.7)
-    selenium-webdriver (2.45.0)
+    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.1)
+    websocket (1.2.2)
     websocket-driver (0.4.0)
     xpath (2.0.0)
       nokogiri (~> 1.3)

data/lib/wist.rb

@@ -8,20 +8,39 @@ module Wist
   end
 
   class << self
-    attr_accessor(:rspec)
+    attr_accessor(:rspec_should)
+    attr_accessor(:rspec_expect)
+    attr_accessor(:assert_syntax_detected)
   end
-  self.rspec = defined?(RSpec)
 
   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)
-    if Wist.rspec
+    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)

data/wist.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name     = 'wist'
-  gem.version  = '0.2.7'
+  gem.version  = '0.3.0'
   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.7
+  version: 0.3.0
 platform: ruby
 authors:
 - Lihan Li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-14 00:00:00.000000000 Z
+date: 2015-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara