daddy 0.5.8 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd84ec760040befe54cf03451b5600897a7d2f34
-  data.tar.gz: 08c50e66fe1fc69b0bdb4662b27609809260f692
+  metadata.gz: ea48edcfc25dedcd96397530b2a15e6483e322be
+  data.tar.gz: 06b2167055540fb56803bb1b44b06479c4b27a01
 SHA512:
-  metadata.gz: 8d384d34b6969e022ac99ad7cc1d21ff5cc0bc871b5347faac7a1edff9e5402fb1f0c30d70013dd9ae8c6254ef6f25cb26cedbd81a57ac4fa06e6d3aed0e44d6
-  data.tar.gz: 8a9e3bd7ffd799ee856cfda176b229a97795604a57586047be96b604a2bcc4bb182c87c3b2795cc7b53e152a9a2e548daff116cda38906660c8bd96e577c0438
+  metadata.gz: 80b81ec1affa34f9083925d131df8f9f23032df69ad040321ea54cffef4e2eba68659d1d021a4f852c564af05891b8d3866801dcd9fdc6e214b0ca4887a67b67
+  data.tar.gz: cfb01067dbe44185dce6f2bb83831e5781e7e98e5547a5981fdc1cf89fb7faa75ffe077630f4f8582ba0f86ff0520395f4be35e6ca5cb2a2c5b831ebdfd897d7

data/lib/daddy/cucumber/helpers/assert.rb

@@ -4,11 +4,11 @@ module Daddy
       def assert_url(path, params = {})
         # スクリーンショットの保存
         capture
-      
+
         # パスのチェック
         re = path.gsub(/\//, '\/')
-        assert /#{re}/ =~ current_path, "想定しているパスではありません。想定 #{path} : 実際 #{current_path}"
-        
+        assert has_current_path?(/#{re}/), "想定しているパスではありません。想定 #{path} : 実際 #{current_path}"
+
         # パラメータのチェック
         current_params = get_current_params()
         params.each do |key, value|
@@ -16,7 +16,7 @@ module Daddy
           assert /#{re}/ =~ current_params[key], "#{key}が想定している値ではありません。想定 #{value} : 実際 #{current_params[key]}"
         end
       end
-      
+
       def assert_visit(path, params = {})
         query_string = ''
         params.each do |key, value|
@@ -27,68 +27,68 @@ module Daddy
           end
           query_string += (key.to_s + '=' + value.to_s)
         end
-      
+
         visit path + query_string
         assert_url path, params
       end
-      
+
       def assert_fill_in(field_name, value)
         fill_in field_name, :with => value
         capture
       end
-      
+
       def assert_check(field_name)
         check field_name
         capture
       end
-      
+
       def assert_uncheck(field_name)
         uncheck field_name
         capture
       end
-      
+
       def assert_choose(field_name)
         choose field_name
         capture
       end
-      
+
       def assert_select(name, value)
         select value, :from => name
         capture
       end
-      
+
       def assert_selector(selector, options = {})
         assert page.has_selector?(selector), options[:message]
         capture if options[:capture]
       end
-      
+
       def assert_no_selector(selector, options = {})
         assert page.has_no_selector?(selector), options[:message]
         capture if options[:capture]
       end
-      
+
       def assert_present(value, message = nil)
         assert value.present?, message
       end
-      
+
       def assert_not_present(value, message = nil)
         assert ! value.present?, message
       end
-      
+
       def assert_content_type(content_type)
         assert_equal content_type, page.response_headers['Content-Type']
       end
-      
+
       def assert_iterate(array)
         iterated = false
-        
+
         array.each do |x|
           iterated ||= yield x
         end
-        
+
         fail 'テスト対象のデータがありません。' unless iterated
       end
-      
+
       def get_current_params
         ret = {}
         if current_url.include?('?')

data/lib/daddy/version.rb

@@ -1,3 +1,3 @@
 module Daddy
-  VERSION = '0.5.8'
+  VERSION = '0.5.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.9
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-17 00:00:00.000000000 Z
+date: 2016-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara