spreewald 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6344c3e67a52d140623e262f62163db7c50d4c8
-  data.tar.gz: 615431258c8bacd8e28459adf8726987226cb348
+  metadata.gz: 356289403f9035cb4de73481fbe3fe874dfaa64e
+  data.tar.gz: eb92d6018a939b0ac4046323e69b14a05435a556
 SHA512:
-  metadata.gz: d831672bf55cb2b5cdc5fb239dfbc1ac494092e00dc518d8d868513f615416d84dd96b2ea49ac7f1fd9c0f5792c402c9ee36812bdb74aaf25532b5870405ba2b
-  data.tar.gz: dd374015482e0fa3403e4d18ee4885635db1d6295e7f2f2c2626bac6acc4804d0c9cbdce6a41a0d56b08bd4046f13032173dce5b49a6de9cb34c38cc61c22ebb
+  metadata.gz: 045cf38593b6bc640a02474401d5416a06310045e53b26dfe0a9b834cfb3d4114fd0b93ee522a886fd346fd0bf502ef356f0fe3f481eb024717f96bedafc0ecf
+  data.tar.gz: b0891a0aa08f0e811cad30834965edfd939b58d2b3b5255af7c8b3a6875a4045092c838ceaa2cbf78499944ac8e8d628a3b572bfed3fde69117c68ff5a16b191

data/CHANGELOG.md

@@ -3,6 +3,13 @@ All notable changes to this project will be documented in this file.
 
 This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## 2.2.1
+- Refactor the `I should see the (number|amount)` step. (see issues [#43](https://github.com/makandra/spreewald/issues/43) and [#44](https://github.com/makandra/spreewald/issues/44))
+    * It can now be composed with the 'within' step
+    * It can now truly match negative numbers
+    * It dropped the hidden dependency on the HTMLEntities gem
+* Fix URLs to the GitHub repository of Spreewald as part of the `_path_to` and `_selector_for` error handling. (see issue [#82](https://github.com/makandra/spreewald/issues/82)) 
+
 ## 2.2.0
 - Add a new step `I should( not)? see a link labeled "STRING"`.
 - Refer to Capybara 3's new flag `Capybara.default_normalize_ws = true` in the READNE,

data/lib/spreewald/web_steps.rb

@@ -217,14 +217,24 @@ end.overridable
 #
 # See [here](https://makandracards.com/makandra/1225-test-that-a-number-or-money-amount-is-shown-with-cucumber) for details
 Then /^I should( not)? see the (?:number|amount) ([\-\d,\.]+)(?: (.*?))?$/ do |negate, amount, unit|
-  no_minus = amount.starts_with?('-') ? '' : '[^\\-]'
-  nbsp = " "
-  regexp = Regexp.new(no_minus + "\\b" + Regexp.quote(amount) + (unit ? "( |#{nbsp}| )(#{unit}|#{Regexp.quote(HTMLEntities.new.encode(unit, :named))})" :"\\b"))
-  expectation = negate ? :not_to : :to
+  expect_to_match = negate ? :not_to : :to
+  is_negative = amount.start_with?('-')
+  absolute_amount = amount.gsub(/^-/, '')
+  expect_minus = is_negative ? '-' : '(?:[^\\-]|^)'
+  word_boundary = '\b'
+  unit_or_boundary = if unit
+    nbsp = " "
+    "( |#{nbsp})(#{unit})"
+  else
+    word_boundary
+  end
+
+  regexp = Regexp.new(expect_minus + word_boundary + Regexp.quote(absolute_amount) + unit_or_boundary)
+
   patiently do
-    expect(page.body).send(expectation, match(regexp))
+    expect(page.text).send(expect_to_match, match(regexp))
   end
-end.overridable
+end.overridable(priority: -5) # priority lower than within
 
 # Like `Then I should see`, but with single instead of double quotes. In case
 # the expected string contains quotes as well.

data/lib/spreewald_support/path_selector_fallbacks.rb

@@ -8,7 +8,7 @@ module PathSelectorFallbacks
       $1
     else
       raise "Can't find mapping from \"#{locator}\" to a selector.\n" +
-        "Add and require a selectors.rb file (compare #{Spreewald.github_url}/examples/selectors.rb)"
+        "Add and require a selectors.rb file (compare #{Spreewald.github_url}/blob/master/examples/selectors.rb)"
     end
   end
 
@@ -22,7 +22,7 @@ module PathSelectorFallbacks
         self.send(path_components.push('path').join('_').to_sym)
       rescue NoMethodError, ArgumentError
         raise "Can't find mapping from \"#{page_name}\" to a path.\n" +
-          "Add and require a paths.rb file (compare #{Spreewald.github_url}/examples/paths.rb)"
+          "Add and require a paths.rb file (compare #{Spreewald.github_url}/blob/master/examples/paths.rb)"
       end
     end
   end

data/lib/spreewald_support/version.rb

@@ -1,3 +1,3 @@
 module Spreewald
-  VERSION = '2.2.0'
+  VERSION = '2.2.1'
 end

data/tests/rails-3_capybara-1/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    spreewald (2.1.3)
+    spreewald (2.2.1)
       cucumber
       cucumber_priority (>= 0.3.0)
       rspec (>= 2.13.0)

data/tests/rails-3_capybara-2/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    spreewald (2.1.3)
+    spreewald (2.2.1)
       cucumber
       cucumber_priority (>= 0.3.0)
       rspec (>= 2.13.0)

data/tests/rails-4_capybara-3/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    spreewald (2.2.0)
+    spreewald (2.2.1)
       cucumber
       cucumber_priority (>= 0.3.0)
       rspec (>= 2.13.0)

data/tests/shared/app/views/static_pages/numbers.html.haml

@@ -0,0 +1,10 @@
+%span 1
+%ul
+  %li 2.3
+  %li 4,5
+  %li -60,72 €
+  %li 13 €
+  %li
+    .nested-number -10,000.99 EUR
+
+.unrelated-element

data/tests/shared/features/shared/web_steps.feature

@@ -253,3 +253,18 @@ Feature: Web steps
       And I should see a link labeled "Also matches via the title attribute"
     But I should not see a link labeled "Nonexistent Link"
       And I should not see a link labeled "First visible link" within ".unrelated-element"
+
+
+  Scenario: /^I should( not)? see the (?:number|amount) ([\-\d,\.]+)(?: (.*?))?$/
+    When I am on "/static_pages/numbers"
+    Then I should see the number 1
+      And I should see the number 2.3
+      And I should see the number 4,5
+      And I should see the amount -60,72 €
+      And I should see the amount 13 €
+      And I should see the amount -10,000.99 EUR within ".nested-number"
+    But I should not see the number 2,3
+      And I should not see the number 4.5
+      And I should not see the number 60,72
+      And I should not see the amount -60,7 €
+      And I should not see the amount -10,000.99 EUR within ".unrelated-element"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spreewald
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Tobias Kraze
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-11 00:00:00.000000000 Z
+date: 2019-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -284,6 +284,7 @@ files:
 - tests/shared/app/views/static_pages/home.html.haml
 - tests/shared/app/views/static_pages/link_to_home.html.haml
 - tests/shared/app/views/static_pages/links.html.haml
+- tests/shared/app/views/static_pages/numbers.html.haml
 - tests/shared/app/views/static_pages/overridden.html.haml
 - tests/shared/app/views/static_pages/see_element.html.haml
 - tests/shared/app/views/static_pages/visibility.html.haml
@@ -439,6 +440,7 @@ test_files:
 - tests/shared/app/views/static_pages/home.html.haml
 - tests/shared/app/views/static_pages/link_to_home.html.haml
 - tests/shared/app/views/static_pages/links.html.haml
+- tests/shared/app/views/static_pages/numbers.html.haml
 - tests/shared/app/views/static_pages/overridden.html.haml
 - tests/shared/app/views/static_pages/see_element.html.haml
 - tests/shared/app/views/static_pages/visibility.html.haml