cuke_master 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ce1860b98075600fd4bd08947c7817e7df499ff
-  data.tar.gz: ae1d87ac953f37a4b767719374d1749aea909575
+  metadata.gz: f16be9a7ced714bfa403092481c1d9cf15f9252a
+  data.tar.gz: 70fbf52ddebf07dac599c75184be59e2264b4232
 SHA512:
-  metadata.gz: dbdbb6ddde0664b5a06daea8d49e10b77a15b9a60486c58fd08077ff59ae7b094107f1ac4d0d4cfdd8238cd7da483f4160500a057f99b39c16b4b602c7b38729
-  data.tar.gz: d793d2fd59f20c0ce1bc6687f959d3de93170bebe3e79c405ffe5f59ec1072dc3fa67f84cb1b84684a0ac5a9122a77603cd7c1a950350c498a1bc460b7a88984
+  metadata.gz: 9dc5e84e3be35ce15db21dbca7b06e5b2095d37fc4123264f6f9957f655bd400b2bf626ee3abd65e6b7c0a32399aac948b123e0cdb3cfb134cc19b04a47d7eed
+  data.tar.gz: ca15e65626f2ba82733316b619e35d1e294906a071647aab09e3e39dde2019b70c53d022e0d47fee9f66df68635353c7cb9031fc33a7e391b2fdcc5a9bc1d741

data/lib/cuke_master/steps.rb

@@ -1,5 +1,5 @@
-# rubocop:disable Lint/Debugger, HandleExceptions
 # rubocop:disable BlockLength
+# rubocop:disable LineLength
 require 'securerandom'
 
 # 1. ========= BROWSE ACTIONS ===========
@@ -32,14 +32,14 @@ end
 # 2.1 Click on a button or a link
 When(/^I click on "([^"]*)"$/) do |content|
   el = first(:xpath, ".//*[contains(text(), '#{content}')]")
-  el = first(:xpath, ".//*[@value='#{content}']") unless el
+  el ||= first(:xpath, ".//*[@value='#{content}']")
   el.click
 end
 
 # 2.2 Click on a button (in case you have a link with the same display)
 When(/^I click on button "([^"]*)"$/) do |content|
   el = first(:xpath, ".//button[contains(text(), '#{content}')]")
-  el = first(:xpath, ".//input[@value='#{content}']") unless el
+  el ||= first(:xpath, ".//input[@value='#{content}']")
   el.click
 end
 
@@ -58,10 +58,8 @@ When(/^I click on "([^"]*)" with attribute "([^"]*)" value "([^"]*)"$/) \
 do |content, attribute, attribute_value|
   el = first(:xpath, ".//*[contains(text(), '#{content}') and \
 contains(@#{attribute}, '#{attribute_value}')]")
-  unless el
-    el = first(:xpath, ".//input[@value='#{content}' and \
+  el ||= first(:xpath, ".//input[@value='#{content}' and \
 contains(@#{attribute}, '#{attribute_value}')]")
-  end
   el.click
 end
 
@@ -96,8 +94,7 @@ end
 When(/^I click on the ([^"]*) "([^"]*)" with attribute "([^"]*)" value \
 "([^"]*)" within the same box as "([^"]*)" with attribute "([^"]*)" value \
 "([^"]*)" as "([^"]*)"$/) \
-do |position, tag, attribute, attribute_value, box_tag, \
-box_attribute_name, box_attribute_value, seeable_content|
+do |position, tag, attribute, attribute_value, box_tag, box_attribute_name, box_attribute_value, seeable_content|
   parent_el =
     find(:xpath,
          ".//#{box_tag}[contains(@#{box_attribute_name}, \
@@ -379,51 +376,64 @@ value "([^"]*)"$/) do |name, tag, attribute, value|
 end
 
 # ============== TRANSFORMING =====================
-Transform(/^\[([^"]*)\]$/) do |string|
-  val = instance_variable_get("@#{string}")
-  if val
-    val
-  else
-    string
-  end
-end
+ParameterType(
+  name: 'variable',
+  regexp: /^\[([^"]*)\]$/,
+  transformer: lambda { |string|
+    val = instance_variable_get("@#{string}")
+    if val
+      val
+    else
+      string
+    end
+  }
+)
 
 # 8.1 Transform date & time
-Transform(/^([^"]*) from now( with format ([^"]*))?$/) \
-do |string, _tmp, format|
-  number = string.split(' ')[0]
-  unit = string.split(' ')[1]
-  date_format = case format
-                when 'd-m-y'
-                  '%d-%m-%Y'
-                when 'y-m-d'
-                  '%Y-%m-%d'
-                when 'm-d-y'
-                  '%m-%d-%Y'
-                else
-                  '%d-%m-%Y'
-                end
-  (Date.today + number.to_i.send(unit)).strftime(date_format)
-end
-
-Transform(/^([^"]*) prior to now( with format ([^"]*))?$/) \
-do |string, _tmp, format|
-  number = string.split(' ')[0]
-  unit = string.split(' ')[1]
-  date_format = case format
-                when 'd-m-y'
-                  '%d-%m-%Y'
-                when 'y-m-d'
-                  '%Y-%m-%d'
-                when 'm-d-y'
-                  '%m-%d-%Y'
-                else
-                  '%d-%m-%Y'
-                end
-  (Date.today - number.to_i.send(unit)).strftime(date_format)
-end
-
-Transform(/^(first|second|third|fourth|fifth) last$/) \
-do |string|
-  "#{string}_last"
-end
+ParameterType(
+  name: 'date',
+  regexp: /^([^"]*) from now( with format ([^"]*))?$/,
+  transformer: lambda { |string, format|
+    number = string.split(' ')[0]
+    unit = string.split(' ')[1]
+    date_format = case format
+                  when 'd-m-y'
+                    '%d-%m-%Y'
+                  when 'y-m-d'
+                    '%Y-%m-%d'
+                  when 'm-d-y'
+                    '%m-%d-%Y'
+                  else
+                    '%d-%m-%Y'
+                  end
+    (Date.today + number.to_i.send(unit)).strftime(date_format)
+  }
+)
+
+ParameterType(
+  name: 'date_before',
+  regexp: /^([^"]*) prior to now( with format ([^"]*))?$/,
+  transformer: lambda { |string, format|
+    number = string.split(' ')[0]
+    unit = string.split(' ')[1]
+    date_format = case format
+                  when 'd-m-y'
+                    '%d-%m-%Y'
+                  when 'y-m-d'
+                    '%Y-%m-%d'
+                  when 'm-d-y'
+                    '%m-%d-%Y'
+                  else
+                    '%d-%m-%Y'
+                  end
+    (Date.today - number.to_i.send(unit)).strftime(date_format)
+  }
+)
+
+ParameterType(
+  name: 'order',
+  regexp: /^(first|second|third|fourth|fifth) last$/,
+  transformer: lambda { |string|
+    "#{string}_last"
+  }
+)

data/lib/cuke_master/version.rb

@@ -1,3 +1,3 @@
 module CukeMaster
-  VERSION = '0.1.7'.freeze
+  VERSION = '0.1.8'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cuke_master
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - James Huynh
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-21 00:00:00.000000000 Z
+date: 2018-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -162,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Cuke Master Steps