spreewald 2.7.1 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff2190f73eb0208f16e61464f60da6e726eac2423f39ad169f862fe2e9c01fb7
-  data.tar.gz: 149e2142c5f9df868ec19521dfb6404edcbc7267b99eabf0048bfb4a082c55d9
+  metadata.gz: 59c446ad46ae093a7bb103d7e4959dbbc7e29327cbc30e5730aff221f8488e36
+  data.tar.gz: e23e4bd833a6234e6ce2b4e6ab104f102708bab13ab54f10aad8b97df08cd39b
 SHA512:
-  metadata.gz: 8141451a1da482256e7f9246c98e5e23bfb3f758854ee942c007fd59943165ae8802ff0dab9cf69b3c2c69225877f4c4dd8ba8ba457f304e8d2b3b805ddf06d2
-  data.tar.gz: beaa7a1eb91313d69a9a6f7d5aeecf580a38b65e0cd7ec1de19b6469ccda5f66c52a0e76f75bbe21a7596865f7458550591ed4540d82ce125fe3912816df07ad
+  metadata.gz: 8d7b6e7ddd55b75433d7c800045c09f68b7175646de8a3f9ac11a5741ee83ce39c22d8bb5a8b5d9d77b4d22df01eda5de51093de4a76cabf73ae354308b12abc
+  data.tar.gz: bc169b566a8878be0ad26b2b1522b960b57772d80d135ffbe4a34476c673282d75b7666d9ccf14a585c229739b3d543620f578c3b59a7e6f62cf036a5df2f90c

data/CHANGELOG.md

@@ -3,6 +3,12 @@ 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.8.0
+- Add radio buttons to the `the "..." (field|button|checkbox|radio button) should( not)? be disabled` step.
+
+## 2.7.2
+- Fix the step `I follow the ... link in the email` if the email contains non-HTTP(S) links
+
 ## 2.7.1
 - Support RFC-compliant encoding of filenames in `Content-Disposition` header (e.g. send_data), as provided by Rails 6.
 

data/README.md

@@ -247,6 +247,9 @@ the step definitions.
 
 * **When I follow the (first|second|third)? link in the e?mail**
 
+  Please note that this step will only follow HTTP and HTTPS links.
+  Other links (such as mailto: or ftp:// links) are ignored.
+
 
 * **Then no e?mail should have been sent**
 
@@ -680,7 +683,7 @@ deprecation notice. Decide for yourself whether you want to use them:
   
       Then "Sponsor" should link to "http://makandra.com/"
   
-  Don't forget the trailing slash. Otherwise you'll get the error 
+  Don't forget the trailing slash. Otherwise you'll get the error
     expected: /http:\/\/makandra.com(\?[^\/]*)?$/
          got: "http://makandra.com/" (using =~)
 
@@ -715,9 +718,9 @@ deprecation notice. Decide for yourself whether you want to use them:
 * **When I enter "..." into the browser dialog**
 
 
-* **Then the "..." (field|button|checkbox) should( not)? be disabled**
+* **Then the "..." (field|button|checkbox|radio button) should( not)? be disabled**
 
-  Tests that an input, button or checkbox with the given label is disabled.
+  Tests that an input, button, checkbox or radio button with the given label is disabled.
 
 
 * **Then the "..." field should( not)? be visible**

data/lib/spreewald/email_steps.rb

@@ -65,6 +65,8 @@ Then /^(an|no) e?mail should have been sent((?: |and|with|from "[^"]+"|bcc "[^"]
   end
 end.overridable
 
+# Please note that this step will only follow HTTP and HTTPS links.
+# Other links (such as mailto: or ftp:// links) are ignored.
 When /^I follow the (first|second|third)? ?link in the e?mail$/ do |index_in_words|
   mail = @mail || ActionMailer::Base.deliveries.last
   index = { nil => 0, 'first' => 0, 'second' => 1, 'third' => 2 }[index_in_words]
@@ -72,7 +74,7 @@ When /^I follow the (first|second|third)? ?link in the e?mail$/ do |index_in_wor
 
   paths = if mail.html_part
     dom = Nokogiri::HTML(mail.html_part.body.to_s)
-    (dom / 'a[href]').map { |a| a['href'].match(url_pattern)[1] }
+    (dom / 'a[href]').map { |a| a['href'].match(url_pattern) }.compact.map { |match| match[1] }
   else
     mail_body = MailFinder.email_text_body(mail).to_s
     mail_body.scan(url_pattern).flatten(1)

data/lib/spreewald/web_steps.rb

@@ -606,7 +606,7 @@ end.overridable(priority: -5) # priority lower than within
 #
 #     Then "Sponsor" should link to "http://makandra.com/"
 #
-# Don't forget the trailing slash. Otherwise you'll get the error 
+# Don't forget the trailing slash. Otherwise you'll get the error
 #   expected: /http:\/\/makandra.com(\?[^\/]*)?$/
 #        got: "http://makandra.com/" (using =~)
 Then /^"([^"]*)" should link to "([^"]*)"$/ do |link_label, target|
@@ -670,23 +670,20 @@ When /^I enter "([^"]*)" into the browser dialog$/ do |text|
   end
 end.overridable
 
-# Tests that an input, button or checkbox with the given label is disabled.
-Then /^the "([^\"]*)" (field|button|checkbox) should( not)? be disabled$/ do |label, kind, negate|
+# Tests that an input, button, checkbox or radio button with the given label is disabled.
+Then /^the "([^\"]*)" (field|button|checkbox|radio button) should( not)? be disabled$/ do |label, kind, negate|
+  element = if kind == 'button'
+    find_with_disabled(:button, label)
+  else
+    find_with_disabled(:field, label)
+  end
+
   if Spreewald::Comparison.compare_versions(Capybara::VERSION, :<, "2.1")
-    if kind == 'field' || kind == 'checkbox'
-      element = find_field(label)
-    else
-      element = find_button(label)
-    end
     expect(element[:disabled]).send(negate ? :to : :not_to, eq(nil))
   else
-    if kind == 'field' || kind == 'checkbox'
-      element = find_field(label, disabled: !negate)
-    else
-      element = find_button(label, disabled: !negate)
-    end
-    expect(element).to be_present
+    expect(!!element.disabled?).to be !negate
   end
+
 end.overridable
 
 # Tests that a field with the given label is visible.

data/lib/spreewald_support/version.rb

@@ -1,3 +1,3 @@
 module Spreewald
-  VERSION = '2.7.1'
+  VERSION = '2.8.0'
 end

data/lib/spreewald_support/web_steps_helpers.rb

@@ -1,3 +1,5 @@
+require 'spreewald_support/comparison'
+
 module WebStepsHelpers
 
   def assert_visible(options)
@@ -8,6 +10,21 @@ module WebStepsHelpers
     visibility_test(options.merge(:expectation => :hidden))
   end
 
+  def find_with_disabled(*args, **options, &optional_filter_block)
+    if Spreewald::Comparison.compare_versions(Capybara::VERSION, :<, "2.0")
+      find(:xpath, XPath::HTML.send(args[0], args[1])) # Versions < 2.0 will find both enabled and disabled fields, nothing to do
+    elsif Spreewald::Comparison.compare_versions(Capybara::VERSION, :<, "2.6")
+      begin
+        find(*args, **options, disabled: false, &optional_filter_block)
+      rescue Capybara::ElementNotFound
+        find(*args, **options, disabled: true, &optional_filter_block)
+      end
+    else
+      options_with_disabled = { disabled: :all }.merge(options)
+      find(*args, **options_with_disabled, &optional_filter_block)
+    end
+  end
+
   private
 
   def visibility_test(options)

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

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    spreewald (2.7.1)
+    spreewald (2.8.0)
       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.7.1)
+    spreewald (2.8.0)
       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.7.1)
+    spreewald (2.8.0)
       cucumber
       cucumber_priority (>= 0.3.0)
       rspec (>= 2.13.0)

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

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

data/tests/shared/app/views/forms/disabled_elements.html.haml

@@ -51,3 +51,21 @@
 
   = label_tag 'enabled_field_2', 'Enabled field #2'
   = text_field_tag 'enabled_field_2', 'value'
+
+-# radio buttons
+= form_tag do
+  - selected = false
+  = label_tag 'disabled_radio_1', 'Disabled radio button #1'
+  = radio_button_tag 'disabled_radio', '1', selected, disabled: true
+
+  = label_tag 'disabled_radio_2', 'Disabled radio button #2'
+  = radio_button_tag 'disabled_radio', '2', selected, disabled: ''
+
+  = label_tag 'disabled_radio_3', 'Disabled radio button #3'
+  = radio_button_tag 'disabled_radio', '3', selected, disabled: 'aaa'
+
+  = label_tag 'enabled_radio_1', 'Enabled radio button #1'
+  = radio_button_tag 'enabled_radio', '1', selected, disabled: false
+
+  = label_tag 'enabled_radio_2', 'Enabled radio button #2'
+  = radio_button_tag 'enabled_radio', '2', selected

data/tests/shared/app/views/mailer/html_email_with_links.haml

@@ -3,4 +3,6 @@
   %body
     %img(src="https://www.example.com/image.png")
     %a(href="https://www.example.com/static_pages/link_target") Click me
+    %a(href="mailto:user@example.com") mailto links should be ignored
+    %a(href="ftp://ftp.example.com/") FTP links are also ignored
     %a(href="https://www.example.com/static_pages/second_link_target") Other link

data/tests/shared/app/views/mailer/text_email_with_links.text.erb

@@ -1,6 +1,7 @@
 Hello!
 
 First link: https://www.example.com/static_pages/link_target
+Ignored link: ftp://ftp.example.com/
 Second link: https://www.example.com/static_pages/second_link_target
 
 Bye!

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

@@ -85,7 +85,7 @@ Feature: Web steps
   Scenario: /^I go back$/
     Given I go to "/static_pages/link_to_home"
       And I follow "Home"
-    
+
     When I go back
     Then I should be on "/static_pages/link_to_home"
 
@@ -341,6 +341,12 @@ Feature: Web steps
     But the "Enabled field #1" field should not be disabled
       And the "Enabled field #2" field should not be disabled
 
+      # radio buttons
+      And the "Disabled radio button #1" radio button should be disabled
+      And the "Disabled radio button #2" radio button should be disabled
+      And the "Disabled radio button #3" radio button should be disabled
+    But the "Enabled radio button #1" radio button should not be disabled
+      And the "Enabled radio button #2" radio button should not be disabled
 
   Scenario: /^the window should be titled "([^"]*)"$/
     When I go to "/static_pages/home"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spreewald
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 2.8.0
 platform: ruby
 authors:
 - Tobias Kraze
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-08 00:00:00.000000000 Z
+date: 2020-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -410,7 +410,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Collection of useful cucumber steps.