spreewald 4.3.2 → 4.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e10c60e2e7cc0636a4cfa38bcd509de5f6e1d1077e796b0e80bfb59eae84f9a3
-  data.tar.gz: 9543765c53174dfab02096267b5ff9c5498a555d730b3a9a0d95b6b10a78b40a
+  metadata.gz: 154442a339318c7f74e490bd7e8783e8abb24820d564b7c52fe6072bfd5cdb2d
+  data.tar.gz: 2351555ffdd10b049ccf1e06e50b5eee41206d15bf716354337c4effb8464d38
 SHA512:
-  metadata.gz: b1189c2293c12c110640dcae56c73a2ccebf395d0fcf52d39ed50180e045da393fef78485602b303fd6882a268424ed5d16fd27ce1936551d1efb352f6e8869d
-  data.tar.gz: '08050f1748090f777465abf05636b0479375d5043f0d08865b07011e20fcddadb3b60c67574dd7c05895d54539a539bc213dfbac1decac949b7b8a83f439d8e5'
+  metadata.gz: 4b4534235a684eaeb0f19b08fd207254c4d3bbf87a2a78cbb34bf04414a5addef88624127abfe3b426a5415d3a517a556be569743248aa098b46c69b7013a59e
+  data.tar.gz: fe86089babc5374da459a9305097292a5d47943cd0cabf6932bd88768d7447e8e7424fff7b9c4c0de2ebc00c82cc83e54fa89636f120c89e612a6dddf5a8c4d6

data/CHANGELOG.md

@@ -3,6 +3,10 @@ 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).
 
+## 4.3.3
+- Fixes that the `Spreewald.field_error_class` configuration
+did not find the correct elements
+
 ## 4.3.2
 - Added built-in support for Rails and Bootstrap (3-5) error classes to the steps
   - `The ... field should have the error ...`

data/lib/spreewald_support/field_errors.rb

@@ -32,7 +32,7 @@ module Spreewald
     end
 
     def custom_error?
-      Spreewald.field_error_class && @element.has_xpath?("ancestor-or-self::*[class='#{Spreewald.field_error_class}']")
+      Spreewald.field_error_class && @element.has_xpath?("ancestor-or-self::div[contains(@class, \"#{Spreewald.field_error_class}\")]")
     end
 
     def bootstrap3_error?

data/lib/spreewald_support/version.rb

@@ -1,3 +1,3 @@
 module Spreewald
-  VERSION = '4.3.2'
+  VERSION = '4.3.3'
 end

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

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

data/tests/rails-6_capybara-3/features/step_definitions/field_error_steps.rb

@@ -0,0 +1,12 @@
+Then /^I set the custom field error class to "([^"]+)"$/ do |error_class|
+  Spreewald.field_error_class = error_class
+end
+
+Then /^I set the custom error message xpath to "(.+)"$/ do |error_message_xpath|
+  Spreewald.error_message_xpath_selector = error_message_xpath
+end
+
+After('@field_errors') do
+  Spreewald.field_error_class = nil
+  Spreewald.error_message_xpath_selector = nil
+end

data/tests/shared/app/controllers/forms_controller.rb

@@ -24,4 +24,7 @@ class FormsController < ApplicationController
   def invalid_bootstrap4_form
   end
 
+  def invalid_custom_form
+  end
+
 end

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

@@ -0,0 +1,19 @@
+= form_tag do
+  .form-group.my-error
+    = label_tag 'text_control', 'A'
+    = text_field_tag 'text_control', 'Text control value'
+    %p.my-error-description
+      A is invalid
+  .form-group.my-error
+    = label_tag 'textarea_control_1', 'B'
+    = text_area_tag 'textarea_control_1', "Textarea control line 1\nTextarea control line 2\n"
+    %p.my-error-description
+      B is invalid
+  .form-group.my-error
+    = label_tag 'disabled_control', 'Disabled'
+    = text_field_tag 'disabled_control', "Disabled control value", disabled: true
+    %p.my-error-description
+      Disabled is invalid
+  .form-group
+    = label_tag 'textarea_control_2', 'C'
+    = text_area_tag 'textarea_control_2', "Textarea control line 1\nTextarea control line 2\n"

data/tests/shared/config/routes.rb

@@ -26,6 +26,7 @@ Rails.application.routes.draw do
   get '/forms/invalid_rails_form', to: 'forms#invalid_rails_form'
   get '/forms/invalid_bootstrap3_form', to: 'forms#invalid_bootstrap3_form'
   get '/forms/invalid_bootstrap4_form', to: 'forms#invalid_bootstrap4_form'
+  get '/forms/invalid_custom_form', to: 'forms#invalid_custom_form'
 
   get '/iframes/iframe_1_content', to: 'iframes#iframe_1_content'
   get '/iframes/iframe_2_content', to: 'iframes#iframe_2_content'

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

@@ -31,7 +31,7 @@ Feature: Web steps
       """
       """
 
-  @javascript
+  @javascript @field_errors
   Scenario: /^the "([^\"]*)" field should( not)? have an error$/
     When I go to "/forms/invalid_rails_form"
     Then the "A" field should have an error
@@ -39,8 +39,27 @@ Feature: Web steps
     Then the "Disabled" field should have an error
     Then the "C" field should not have an error
 
+    When I go to "/forms/invalid_bootstrap3_form"
+    Then the "A" field should have an error
+    Then the "B" field should have an error
+    Then the "Disabled" field should have an error
+    Then the "C" field should not have an error
 
-  @javascript
+    When I go to "/forms/invalid_bootstrap4_form"
+    Then the "A" field should have an error
+    Then the "B" field should have an error
+    Then the "Disabled" field should have an error
+    Then the "C" field should not have an error
+
+    When I set the custom field error class to "my-error"
+      And I go to "/forms/invalid_custom_form"
+    Then the "A" field should have an error
+    Then the "B" field should have an error
+    Then the "Disabled" field should have an error
+    Then the "C" field should not have an error
+
+
+  @javascript @field_errors
   Scenario: /^the "([^"]*)" field should have the error "([^"]*)"$/
     When I go to "/forms/invalid_rails_form"
     Then the "A" field should have the error "is invalid"
@@ -57,6 +76,12 @@ Feature: Web steps
     Then the "B" field should have the error "is invalid"
     Then the "Disabled" field should have the error "is invalid"
 
+    When I set the custom field error class to "my-error"
+      And I set the custom error message xpath to "parent::*/child::*[contains(@class, "my-error-description")]"
+      And I go to "/forms/invalid_custom_form"
+    Then the "A" field should have the error "is invalid"
+    Then the "B" field should have the error "is invalid"
+    Then the "Disabled" field should have the error "is invalid"
 
   Scenario: /^I should see a form with the following values:$/
     When I go to "/forms/form1"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spreewald
 version: !ruby/object:Gem::Version
-  version: 4.3.2
+  version: 4.3.3
 platform: ruby
 authors:
 - Tobias Kraze
@@ -232,6 +232,7 @@ files:
 - tests/rails-6_capybara-3/features/overriding.feature
 - tests/rails-6_capybara-3/features/session_steps.feature
 - tests/rails-6_capybara-3/features/step_definitions/.gitkeep
+- tests/rails-6_capybara-3/features/step_definitions/field_error_steps.rb
 - tests/rails-6_capybara-3/features/step_definitions/overriding_steps.rb
 - tests/rails-6_capybara-3/features/step_definitions/test_steps.rb
 - tests/rails-6_capybara-3/features/support/env.rb
@@ -265,6 +266,7 @@ files:
 - tests/shared/app/views/forms/form2.html.haml
 - tests/shared/app/views/forms/invalid_bootstrap3_form.html.haml
 - tests/shared/app/views/forms/invalid_bootstrap4_form.html.haml
+- tests/shared/app/views/forms/invalid_custom_form.html.haml
 - tests/shared/app/views/forms/invalid_rails_form.html.haml
 - tests/shared/app/views/forms/select_fields.html.haml
 - tests/shared/app/views/iframes/iframe_1_content.haml
@@ -395,6 +397,7 @@ test_files:
 - tests/rails-6_capybara-3/features/overriding.feature
 - tests/rails-6_capybara-3/features/session_steps.feature
 - tests/rails-6_capybara-3/features/step_definitions/.gitkeep
+- tests/rails-6_capybara-3/features/step_definitions/field_error_steps.rb
 - tests/rails-6_capybara-3/features/step_definitions/overriding_steps.rb
 - tests/rails-6_capybara-3/features/step_definitions/test_steps.rb
 - tests/rails-6_capybara-3/features/support/env.rb
@@ -428,6 +431,7 @@ test_files:
 - tests/shared/app/views/forms/form2.html.haml
 - tests/shared/app/views/forms/invalid_bootstrap3_form.html.haml
 - tests/shared/app/views/forms/invalid_bootstrap4_form.html.haml
+- tests/shared/app/views/forms/invalid_custom_form.html.haml
 - tests/shared/app/views/forms/invalid_rails_form.html.haml
 - tests/shared/app/views/forms/select_fields.html.haml
 - tests/shared/app/views/iframes/iframe_1_content.haml