spreewald 2.99.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04e59902ff7a473603ddb7619f350b34de83072a81e36afc5767480e837c4345
-  data.tar.gz: 5dfc9a6630cc0332228024528a55025f7d672140bd0acabbffecbafbcd18188c
+  metadata.gz: 6a51defb2267ab0f0f6e9123b474e0069758e59eaa3f18cadefdfdb81a5f5760
+  data.tar.gz: f47297c29b676ee194c1dbc2f335eab608afefa9730e124e8811d4542089031e
 SHA512:
-  metadata.gz: 21eed3d8dab955f4da45fa3a30fda49c1d3f6ca2b462736cb4e171725a7c685f6e6149a1a261646028fcb1310fb9a070e68679426a670d77271d3c2e2926ca58
-  data.tar.gz: 299c23ccc3f6f751b850e0d776da679c6f2c4480cb1e150ff655cc31aaaffd33008f592b5b3d53a4f9bae543391ec75943f42805949b5be690f1d383a25bfed4
+  metadata.gz: 3b93c18acce9d744364898f65e6f3597d06b37ed85d69bb81e3593521d0433bc56338b974c32133c0fce749190ee8af63c146b355e12601397b3641d4424380d
+  data.tar.gz: b675ad24c9c6e9836880d9111f1538d8f3b5c2d91e390dc5ee5165842cb19298d039fa428405dd47df20daa40b59234f641fcc3e4cab2cf0f6405449ecad981c

data/CHANGELOG.md

@@ -3,12 +3,53 @@ 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.99.2
+## 3.0.3
+
+- The `an email should have been sent with` step now interprets all lines as body when not specifying headers (see issue [#157](https://github.com/makandra/spreewald/issues/157))
+
+## 3.0.2
+
+- Introduce wildcard for the beginning of a line. (see issue [#155](https://github.com/makandra/spreewald/issues/155))
+  - This will allow you to check for a specific sentence inside the body
+
+## 3.0.1
 
 - Fix deduplication of linebreaks for html mails in mail finder. (see issue [#153](https://github.com/makandra/spreewald/issues/153))
 
-## 2.99.1
+## 3.0.0
 
+### Breaking changes
+
+- The following steps have been removed:
+  - `/^the file "([^"]*)" was attached(?: as (?:([^"]*)\/)?([^"]*))? to the ([^"]*) above(?: at "([^"]*)")?$/` (see [#106](https://github.com/makandra/spreewald/issues/106), this functionality was moved to [CucumberFactory](https://github.com/makandra/cucumber_factory))
+  - `/^the "([^"]*)" field should have no error$/` (see [#134](https://github.com/makandra/spreewald/issues/134))
+  - `/^I should get a text response$/` (see [#135](https://github.com/makandra/spreewald/issues/135))
+  - `/^I wait for the page to load$/` (see [#136](https://github.com/makandra/spreewald/issues/136))
+  - `debugger` (was an alias for `console`)
+- These email steps have been removed in favor of `(an?|no)( HTML| plain-text|) e?mail should have been sent with:` (see [#132](https://github.com/makandra/spreewald/issues/132#issuecomment-631457290)):
+  - `/^(an|no) e?mail should have been sent((?: |and|with|from "[^"]+"|bcc "[^"]+"|cc "[^"]+"|to "[^"]+"|the subject "[^"]+"|the body "[^"]+"|the attachments "[^"]+")+)$/`
+  - `/^that e?mail should( not)? have the following lines in the body$/`
+  - `/^that e?mail should have the following (?:|content in the )body:$/`
+- The `and disabled` modifier of the step `the "..." checkbox should( not)? be checked` has been removed. Use the step without the modifier together with the step `the "..." checkbox should be disabled` to achieve the old behavior.
+- The step `/^(the tag )?"([^\"]+)" should( not)? be visible$/` lost its `not` modifier (Use `Then (the tag )?"..." should be hidden` or `Then I should not see "..."`)
+- The file `lib/spreewald/timecop_steps.rb` was removed (was an alias for `lib/spreewald/time_steps.rb`).
+- The step `(an?|no)( HTML| plain-text|) e?mail should have been sent with:` does now require that the whole body is matched.
+- All web steps interacting with forms will now find both enabled and disabled fields. We encourage you to assert the "disabled" state in a separate step when needed, Spreewald offers these steps as well.
+
+  The following steps have been adjusted:
+  - `I should( not)? see a field "..."`
+  - `the "..." field should( not)? contain "..."`
+  - `I should see a form with the following values:`
+  - `the "..." field should have the error "..."`
+  - `the "..." field should( not)? have an error`
+  - `the "..." checkbox should( not)? be checked`
+  - `"..." should be selected for "..."`
+  - `nothing should be selected for "..."`
+  - `"..." should( not)? be an option for "..."`
+  - `the "..." field should( not)? be visible`
+  - `the "..." select should( not)? be sorted`
+  
+### Compatible changes
 - Reintroduced support for emails with CRLF line ending
 
 ## 2.99.0

data/README.md

@@ -197,8 +197,7 @@ the step definitions.
 * **Then console**
 
   Pauses test execution and opens an IRB shell with current context. Does not halt the application-
-  under-test. (Replaces the "Then debugger" step that has never been adequate
-  for its job)
+  under-test.
 
 
 * **AfterStep @slow-motion**
@@ -238,9 +237,6 @@ the step definitions.
   
         """
   
-  Because of backwards-compatibility, the body currently only has to be a prefix
-  of the real body. However, this is deprecated and will be removed in a future
-  version. Use wildcards instead.
   You may skip lines in the header, of course.
 
 
@@ -269,13 +265,6 @@ the step definitions.
   This uses the same syntax as `Then an email should have been sent with:`
 
 
-### file_attachment_steps.rb 
-
-* **Given the file "..." was attached( as (.../)?...)? to the ... above( at "...")?**
-
-  This step is deprecated and will be removed from spreewald. If you still want to use it, copy the code to your project's own steps.
-
-
 ### session_steps.rb 
 
 * **When ... in the browser session "..."**
@@ -330,8 +319,6 @@ Please note that the two approaches branch. While ActiveSupport will freeze the
       When it is a few hours earlier
 
 
-
-
 ### web_steps.rb 
 
 Most of cucumber-rails' original web steps plus a few of our own.
@@ -559,10 +546,7 @@ deprecation notice. Decide for yourself whether you want to use them:
 * **Then the "..." field should( not)? have an error**
 
 
-* **Then the "..." field should have no error**
-
-
-* **Then the "..." checkbox should( not)? be checked( and disabled)?**
+* **Then the "..." checkbox should( not)? be checked?**
 
 
 * **Then the radio button "..." should( not)? be (checked|selected)**
@@ -615,14 +599,12 @@ deprecation notice. Decide for yourself whether you want to use them:
 * **When I reload the page**
 
 
-* **Then (the tag )?"..." should( not)? be visible**
+* **Then (the tag )?"..." should be visible**
 
   Checks that an element is actually present and visible, also considering styles.
   Within a selenium test, the browser is asked whether the element is really visible
   In a non-selenium test, we only check for `.hidden`, `.invisible` or `style: display:none`
   
-  The step 'Then (the tag )?"..." should **not** be visible' is ambiguous. Please use 'Then (the tag )?"..." should be hidden' or 'Then I should not see "..."' instead. Note that the **not** option will be removed in future versions of Spreewald.
-  
   More details [here](https://makandracards.com/makandra/1049-capybara-check-that-a-page-element-is-hidden-via-css)
 
 
@@ -675,11 +657,6 @@ deprecation notice. Decide for yourself whether you want to use them:
          got: "http://makandra.com/" (using =~)
 
 
-* **Then I should get a text response**
-
-  Checks that the result has content type `text/plain`
-
-
 * **When I follow "..." inside any "..."**
 
   Click a link within an element matching the given selector. Will try to be clever
@@ -715,13 +692,6 @@ deprecation notice. Decide for yourself whether you want to use them:
   Tests that a field with the given label is visible.
 
 
-* **When I wait for the page to load**
-
-  Waits for the page to finish loading and AJAX requests to finish.
-  
-  More details [here](https://makandracards.com/makandra/12139-waiting-for-page-loads-and-ajax-requests-to-finish-with-capybara).
-
-
 * **When I perform basic authentication as ".../..." and go to ...**
 
   Performs HTTP basic authentication with the given credentials and visits the given path.

data/features/binary.feature

@@ -240,7 +240,7 @@ Feature: The `spreewald` binary
 
   Scenario: Print version
     When I run `spreewald --version`
-    Then the output should contain "Spreewald 2."
+    Then the output should contain "Spreewald 3."
 
     When I run `spreewald -v`
-    Then the output should contain "Spreewald 2."
+    Then the output should contain "Spreewald 3."

data/lib/spreewald/development_steps.rb

@@ -5,15 +5,8 @@ Then /^it should work(.+?)?$/ do |message|
   pending(message)
 end.overridable
 
-# nodoc
-Then 'debugger' do
-  warn 'The step "Then debugger" will be removed in future versions of Spreewald. Please use "Then console" instead.'
-  step 'console' # Alias
-end.overridable
-
 # Pauses test execution and opens an IRB shell with current context. Does not halt the application-
-# under-test. (Replaces the "Then debugger" step that has never been adequate
-# for its job)
+# under-test.
 Then 'console' do
   require 'irb'
   ARGV.clear # IRB takes ARGV as its own arguments

data/lib/spreewald/email_steps.rb

@@ -30,9 +30,6 @@ end.overridable
 #
 #       """
 #
-# Because of backwards-compatibility, the body currently only has to be a prefix
-# of the real body. However, this is deprecated and will be removed in a future
-# version. Use wildcards instead.
 # You may skip lines in the header, of course.
 Then /^(an?|no)( HTML| plain-text|) e?mail should have been sent with:$/ do |mode, type, raw_data|
   patiently do
@@ -70,26 +67,6 @@ ERROR
   end
 end.overridable
 
-# nodoc (deprecated)
-Then /^(an|no) e?mail should have been sent((?: |and|with|from "[^"]+"|bcc "[^"]+"|cc "[^"]+"|to "[^"]+"|the subject "[^"]+"|the body "[^"]+"|the attachments "[^"]+")+)$/ do |mode, query|
-  warn "The step `an email should have been sent (from ...) (to ...) (cc ...) ...` has been deprecated in favor of `(an?|no)( HTML| plain-text|) e?mail should have been sent with:`"
-  patiently do
-    filename_method = Rails::VERSION::MAJOR < 3 ? 'original_filename' : 'filename'
-    @mail = ActionMailer::Base.deliveries.find do |mail|
-        [ query =~ /to "([^"]+)"/ && !mail.to.include?(MailFinder.resolve_email $1),
-          query =~ /cc "([^"]+)"/ && !mail.cc.include?(MailFinder.resolve_email $1),
-          query =~ /bcc "([^"]+)"/ && !mail.bcc.include?(MailFinder.resolve_email $1),
-          query =~ /from "([^"]+)"/ && !mail.from.include?(MailFinder.resolve_email $1),
-          query =~ /reply_to "([^"]+)"/ && !mail.reply_to.include?(MailFinder.resolve_email $1),
-          query =~ /subject "([^"]+)"/ && !mail.subject.include?($1),
-          query =~ /the attachments "([^"]+)"/ && $1.split(/\s*,\s*/).sort != Array(mail.attachments).collect(&:"#{filename_method}").sort
-        ].none?
-    end
-    expectation = mode == 'no' ? 'not_to' : 'to'
-    expect(@mail).send(expectation, be_present)
-  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|
@@ -141,22 +118,3 @@ Then /^show me the e?mail( header)?s with:$/ do |only_header, raw_data|
 
   print MailFinder.show_mails(results.mails, only_header)
 end.overridable
-
-# nodoc (deprecated)
-Then /^that e?mail should( not)? have the following lines in the body:$/ do |negate, body|
-  warn "The step /^that e?mail should( not)? have the following lines in the body:$/ has been deprecated in favor of the updated step /^(an?|no)( HTML| plain-text|) e?mail should have been sent with:$/."
-  expectation = negate ? 'not_to' : 'to'
-  mail = @mail || ActionMailer::Base.deliveries.last
-  email_text_body = MailFinder.email_text_body(mail)
-
-  body.to_s.strip.split(/\n/).each do |line|
-    expect(email_text_body).send(expectation, include(line.strip))
-  end
-end.overridable
-
-# nodoc (deprecated)
-Then /^that e?mail should have the following (?:|content in the )body:$/ do |body|
-  warn "The step /^that e?mail should have the following( content in the)? body:$/ has been deprecated in favor of the updated step /^(an?|no)( HTML| plain-text|) e?mail should have been sent with:$/."
-  mail = @mail || ActionMailer::Base.deliveries.last
-  expect(MailFinder.email_text_body(mail)).to include(body.strip)
-end.overridable

data/lib/spreewald/web_steps.rb

@@ -201,10 +201,10 @@ Then /^I should( not)? see a field "([^"]*)"$/ do |negate, name|
   expectation = negate ? :not_to : :to
   patiently do
     begin
-      # In old Capybaras find_field returns nil, so we assign it to `field`
-      field = find_field(name)
+      # In old Capybaras find returns nil, so we assign it to `field`
+      field = find_with_disabled(:field, name)
     rescue Capybara::ElementNotFound
-      # In Capybara 0.4+ #find_field raises an error instead of returning nil
+      # In Capybara 0.4+ #find raises an error instead of returning nil
       # We must explicitely reset the field variable from a previous patiently iteration
       field = nil
     end
@@ -327,7 +327,7 @@ end.overridable
 # Checks that an input field contains some value (allowing * as wildcard character)
 Then /^the "([^"]*)" field should (not )?contain "([^"]*)"$/ do |label, negate, expected_string|
   patiently do
-    field = find_field(label)
+    field = find_with_disabled(:field, label)
     field_value = case field.tag_name
     when 'select'
       options = field.all('option')
@@ -347,7 +347,7 @@ end.overridable
 # Checks that a multiline textarea contains some value (allowing * as wildcard character)
 Then(/^the "(.*?)" field should (not )?contain:$/) do |label, negate, expected_string|
   patiently do
-    field = find_field(label)
+    field = find_with_disabled(:field, label)
     expect(field.value.chomp).send(negate ? :not_to : :to, contain_with_wildcards(expected_string))
   end
 end.overridable
@@ -369,7 +369,7 @@ end.overridable
 # Checks that an input field was wrapped with a validation error
 Then /^the "([^"]*)" field should have the error "([^"]*)"$/ do |field, error_message|
   patiently do
-    element = find_field(field)
+    element = find_with_disabled(:field, field)
     classes = element.find(:xpath, '..')[:class].split(' ')
 
     form_for_input = element.find(:xpath, 'ancestor::form[1]')
@@ -390,35 +390,17 @@ end.overridable
 Then /^the "([^\"]*)" field should( not)? have an error$/ do |label, negate|
   patiently do
     expectation = negate ? :not_to : :to
-    field = find_field(label)
+    field = find_with_disabled(:field, label)
     expect(field[:id]).to be_present # prevent bad CSS selector if field lacks id
     expect(page).send(expectation, have_css(".field_with_errors ##{field[:id]}"))
   end
 end.overridable
 
-Then /^the "([^"]*)" field should have no error$/ do |field|
-  warn 'The step /^the "([^"]*)" field should have no error$/ is deprecated and scheduled for removal. Use the step /^the "([^\"]*)" field should( not)? have an error$/ instead.'
-  patiently do
-    element = find_field(field)
-    classes = element.find(:xpath, '..')[:class].split(' ')
-    expect(classes).not_to include('field_with_errors')
-    expect(classes).not_to include('error')
-  end
-end.overridable
-
-Then /^the "([^"]*)" checkbox should( not)? be checked( and disabled)?$/ do |label, negate, disabled|
+Then /^the "([^"]*)" checkbox should( not)? be checked?$/ do |label, negate|
   expectation = negate ? :not_to : :to
 
-  if disabled
-    warn 'The step /^the "([^"]*)" checkbox should( not)? be checked( and disabled)?$/ will lose the `and disabled` modifier in Spreewald 3. In that version, the step will find a checkbox regardless of whether it is disabled.'
-  end
-
   patiently do
-    field = if Spreewald::Comparison.compare_versions(Capybara::VERSION, :<, "2.1")
-      find_field(label)
-    else
-      find_field(label, :disabled => !!disabled)
-    end
+    field = find_with_disabled(:field, label)
     expect(field).send expectation, be_checked
   end
 end.overridable
@@ -489,7 +471,7 @@ end.overridable
 
 Then /^nothing should be selected for "([^"]*)"$/ do |field|
   patiently do
-    select = find_field(field)
+    select = find_with_disabled(:field, field)
     begin
       selected_option = select.find(:xpath, ".//option[@selected = 'selected']") || select.all(:css, 'option').first
       value = selected_option ? selected_option.value : nil
@@ -509,11 +491,11 @@ Then /^"([^"]*)" should( not)? be an option for "([^"]*)"$/ do |value, negate, f
   patiently do
     if negate
       begin
-        expect(find_field(field)).to have_no_css(*finder_arguments)
+        expect(find_with_disabled(:field, field)).to have_no_css(*finder_arguments)
       rescue Capybara::ElementNotFound
       end
     else
-      expect(find_field(field)).to have_css(*finder_arguments)
+      expect(find_with_disabled(:field, field)).to have_css(*finder_arguments)
     end
   end
 end.overridable
@@ -542,18 +524,12 @@ end.overridable
 # Within a selenium test, the browser is asked whether the element is really visible
 # In a non-selenium test, we only check for `.hidden`, `.invisible` or `style: display:none`
 #
-# The step 'Then (the tag )?"..." should **not** be visible' is ambiguous. Please use 'Then (the tag )?"..." should be hidden' or 'Then I should not see "..."' instead. Note that the **not** option will be removed in future versions of Spreewald.
-#
 # More details [here](https://makandracards.com/makandra/1049-capybara-check-that-a-page-element-is-hidden-via-css)
-Then /^(the tag )?"([^\"]+)" should( not)? be visible$/ do |tag, selector_or_text, hidden|
-  if hidden
-    warn "The step 'Then ... should not be visible' is prone to misunderstandings. Please use 'Then ... should be hidden' or 'Then I should not see ...' instead."
-  end
-
+Then /^(the tag )?"([^\"]+)" should be visible$/ do |tag, selector_or_text|
   options = {}
   tag ? options.store(:selector, selector_or_text) : options.store(:text, selector_or_text)
 
-  hidden ? assert_hidden(options) : assert_visible(options)
+   assert_visible(options)
 end.overridable
 
 # Checks that an element is actually present and hidden, also considering styles.
@@ -621,12 +597,6 @@ Then /^"([^"]*)" should link to "([^"]*)"$/ do |link_label, target|
   end
 end.overridable
 
-# Checks that the result has content type `text/plain`
-Then /^I should get a text response$/ do
-  warn 'The step /^I should get a text response$/ is deprecated and scheduled for removal. Use `I should get a response with content-type "text/plain"` instead.'
-  step 'I should get a response with content-type "text/plain"'
-end.overridable
-
 # Click a link within an element matching the given selector. Will try to be clever
 # and disregard elements that don't contain a matching link.
 #
@@ -695,11 +665,11 @@ end.overridable
 # Tests that a field with the given label is visible.
 Then /^the "([^\"]*)" field should( not)? be visible$/ do |label, hidden|
   if Spreewald::Comparison.compare_versions(Capybara::VERSION, :<, "2.1")
-    field = find_field(label)
+    field = find_with_disabled(:field, label)
   else
     # Capybara 2.1+ won't usually interact with hidden elements,
     # but we can override this behavior by passing { visible: false }
-    field = find_field(label, :visible => false)
+    field = find_with_disabled(:field, label, :visible => false)
   end
 
   selector = "##{field['id']}"
@@ -711,20 +681,6 @@ Then /^the "([^\"]*)" field should( not)? be visible$/ do |label, hidden|
   end
 end.overridable
 
-# Waits for the page to finish loading and AJAX requests to finish.
-#
-# More details [here](https://makandracards.com/makandra/12139-waiting-for-page-loads-and-ajax-requests-to-finish-with-capybara).
-When /^I wait for the page to load$/ do
-  warn 'The step /^I wait for the page to load$/ is deprecated and scheduled for removal. Please see https://github.com/makandra/spreewald/issues/136'
-  if javascript_capable?
-    patiently do
-      # when no jQuery is loaded, we assume there are no pending AJAX requests
-      page.execute_script("return typeof jQuery === 'undefined' || $.active == 0;").should == true
-    end
-  end
-  page.has_content? ''
-end.overridable
-
 # Performs HTTP basic authentication with the given credentials and visits the given path.
 #
 # More details [here](https://makandracards.com/makandra/971-perform-http-basic-authentication-in-cucumber).
@@ -761,7 +717,7 @@ end.overridable
 # Tests whether a select field is sorted. Uses Array#natural_sort, if defined;
 # Array#sort else.
 Then /^the "(.*?)" select should( not)? be sorted$/ do |label, negate|
-  select = find_field(label)
+  select = find_with_disabled(:field, label)
   options = select.all('option').reject { |o| o.value.blank? }
   option_texts = options.collect(&:text)
 

data/lib/spreewald_support/mail_finder.rb

@@ -15,6 +15,11 @@ class MailFinder
         end
       end
 
+      # Interpret all lines as body if there are no header-link lines
+      if conditions.blank?
+        body = [header, body].join("\n\n")
+      end
+
       filename_method = Rails::VERSION::MAJOR < 3 ? 'original_filename' : 'filename'
       matching_header = ActionMailer::Base.deliveries.select do |mail|
         [ conditions[:to].nil? || mail.to.include?(resolve_email conditions[:to]),
@@ -82,14 +87,13 @@ class MailFinder
     end
 
     def expected_body_regex(expected_body)
-      # To stay backwards-compatible, this will only check whether an email
-      # starts with the expected body.
       expected = '\A\n' + Regexp.quote(expected_body.strip) + '\n\Z'
       expected.gsub! '\n\*\n', '\n[\s\S]*\n'
       expected.gsub! '\*\n', '.*\n'
+      expected.gsub! '\n\*', '\n.*'
 
       expected.gsub! '\A\n', '\A'
-      expected.gsub! '\n\Z', '' # Change '' to '\Z' to force that the whole body matches
+      expected.gsub! '\n\Z', '\Z'
 
       Regexp.new(expected)
     end

data/lib/spreewald_support/version.rb

@@ -1,3 +1,3 @@
 module Spreewald
-  VERSION = '2.99.2'
+  VERSION = '3.0.3'
 end

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

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

data/tests/rails-6_capybara-3/app/mailers/spreewald_mailer.rb

@@ -38,5 +38,29 @@ class SpreewaldMailer < ApplicationMailer
     email
   end
 
+  def html_email_with_specific_line
+    email
+  end
+
+  def text_email_with_specific_line
+    email
+  end
+
+  def html_email_for_successful_test_without_header
+    email
+  end
+
+  def text_email_for_successful_test_without_header
+    email
+  end
+
+  def html_email_for_failed_test_without_header
+    email
+  end
+
+  def text_email_for_failed_test_without_header
+    email
+  end
+
 end
 

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

@@ -34,6 +34,36 @@ class EmailsController < ApplicationController
     render_nothing
   end
 
+  def send_html_email_with_specific_line
+    deliver :html_email_with_specific_line
+    render_nothing
+  end
+
+  def send_text_email_with_specific_line
+    deliver :text_email_with_specific_line
+    render_nothing
+  end
+
+  def send_html_email_for_successful_test_without_header
+    deliver :html_email_for_successful_test_without_header
+    render_nothing
+  end
+
+  def send_text_email_for_successful_test_without_header
+    deliver :text_email_for_successful_test_without_header
+    render_nothing
+  end
+
+  def send_html_email_for_failed_test_without_header
+    deliver :html_email_for_failed_test_without_header
+    render_nothing
+  end
+
+  def send_text_email_for_failed_test_without_header
+    deliver :text_email_for_failed_test_without_header
+    render_nothing
+  end
+
   private
 
   def deliver(method_name)

data/tests/shared/app/models/mailer.rb

@@ -41,6 +41,30 @@ class Mailer < ActionMailer::Base
       email
     end
 
+    def html_email_with_specific_line
+      email
+    end
+
+    def text_email_with_specific_line
+      email
+    end
+
+    def html_email_for_successful_test_without_header
+      email
+    end
+
+    def text_email_for_successful_test_without_header
+      email
+    end
+
+    def html_email_for_failed_test_without_header
+      email
+    end
+
+    def text_email_for_failed_test_without_header
+      email
+    end
+
   else
 
     def email
@@ -66,6 +90,30 @@ class Mailer < ActionMailer::Base
       email
     end
 
+    def html_email_with_specific_line
+      email
+    end
+
+    def text_email_with_specific_line
+      email
+    end
+
+    def html_email_for_successful_test_without_header
+      email
+    end
+
+    def text_email_for_successful_test_without_header
+      email
+    end
+
+    def html_email_for_failed_test_without_header
+      email
+    end
+
+    def text_email_for_failed_test_without_header
+      email
+    end
+
   end
 
 end

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

@@ -4,6 +4,9 @@
   = label_tag 'checked_name', 'Checked'
   = check_box_tag 'checked_name', 'value', checked
 
+  = label_tag 'checked_disabled_name', 'Checked disabled'
+  = check_box_tag 'checked_disabled_name', 'value', checked, disabled: true
+
   - checked = false
   = label_tag 'unchecked_name', 'Unchecked'
   = check_box_tag 'unchecked_name', 'value', checked

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

@@ -69,3 +69,4 @@
 
   = label_tag 'enabled_radio_2', 'Enabled radio button #2'
   = radio_button_tag 'enabled_radio', '2', selected
+

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

@@ -3,6 +3,9 @@
   = label_tag 'text_control', 'Text control'
   = text_field_tag 'text_control', 'Text control value'
 
+  = label_tag 'disabled_text_control', 'Disabled text control'
+  = text_field_tag 'disabled_text_control', 'Disabled text control value', disabled: true
+
   = label_tag 'select_control', 'Select control'
   = select_tag 'select_control', options_for_select([['Label 1', 'value1'], ['Label 2', 'value2'], ['Label 3', 'value3']], 'value2')
 
@@ -26,4 +29,4 @@
   = label_tag 'radio_button_control_radio1', 'Radio 1'
   = radio_button_tag 'radio_button_control', 'radio1'
   = label_tag 'radio_button_control_radio2', 'Radio 2'
-  = radio_button_tag 'radio_button_control', 'radio2'
+  = radio_button_tag 'radio_button_control', 'radio2'

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

@@ -5,6 +5,9 @@
   .form-group.field_with_errors
     = label_tag 'textarea_control_1', 'B is invalid'
     = text_area_tag 'textarea_control_1', "Textarea control line 1\nTextarea control line 2\n"
+  .form-group.field_with_errors
+    = label_tag 'disabled_control', 'Disabled is invalid'
+    = text_field_tag 'disabled_control', "Disabled control value", disabled: true
   .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/app/views/mailer/html_email_for_failed_test_without_header.haml

@@ -0,0 +1,5 @@
+!!!
+%html(lang="en" xmlns="http://www.w3.org/1999/xhtml")
+  %body
+    %p
+      Bye

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

@@ -0,0 +1,7 @@
+!!!
+%html(lang="en" xmlns="http://www.w3.org/1999/xhtml")
+  %body
+    %p
+      Hello
+    %p
+      Bye

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

@@ -0,0 +1,11 @@
+!!!
+%html(lang="en" xmlns="http://www.w3.org/1999/xhtml")
+  %body
+    %p
+      Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.
+
+    %p
+      Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. VERY IMPORTANT SENTENCE. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.
+
+    %p
+      Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.

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

@@ -0,0 +1 @@
+Bye

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

@@ -0,0 +1,3 @@
+Hello
+
+Bye

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

@@ -0,0 +1,5 @@
+Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.
+
+Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. VERY IMPORTANT SENTENCE. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.
+
+Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.

data/tests/shared/config/routes.rb

@@ -11,6 +11,12 @@ Rails.application.routes.draw do
   get '/emails/send_html_email_with_links', to: 'emails#send_html_email_with_links'
   get '/emails/send_text_email_with_links', to: 'emails#send_text_email_with_links'
   get '/emails/send_html_email_with_linebreaks', to: 'emails#send_html_email_with_linebreaks'
+  get '/emails/send_html_email_with_specific_line', to: 'emails#send_html_email_with_specific_line'
+  get '/emails/send_text_email_with_specific_line', to: 'emails#send_text_email_with_specific_line'
+  get '/emails/send_html_email_for_successful_test_without_header', to: 'emails#send_html_email_for_successful_test_without_header'
+  get '/emails/send_text_email_for_successful_test_without_header', to: 'emails#send_text_email_for_successful_test_without_header'
+  get '/emails/send_html_email_for_failed_test_without_header', to: 'emails#send_html_email_for_failed_test_without_header'
+  get '/emails/send_text_email_for_failed_test_without_header', to: 'emails#send_text_email_for_failed_test_without_header'
 
   get '/forms/checkbox_form', to: 'forms#checkbox_form'
   get '/forms/disabled_elements', to: 'forms#disabled_elements'

data/tests/shared/features/shared/email_steps.feature

@@ -200,7 +200,7 @@ Feature: Test Spreewald's email steps
         '''
       """
 
-    # Test body with wildcard not at the end of a line
+    # Test body with to few paragraphs
     Then the following multiline step should fail:
       """
       Then an email should have been sent with:
@@ -211,71 +211,25 @@ Feature: Test Spreewald's email steps
         Subject: SUBJECT
 
         Body
-        *th
-        line
-        break
-        '''
-      """
-
-  Scenario: Scenario: /^(an|no) e?mail should have been sent((?: |and|with|from "[^"]+"|bcc "[^"]+"|cc "[^"]+"|to "[^"]+"|the subject "[^"]+"|the body "[^"]+"|the attachments "[^"]+")+)$/
-    When I go to "/emails/send_email"
-
-    # Test with correct conditions
-    Then the following multiline step should succeed:
-      """
-      Then an email should have been sent from "from@example.com" to "to@example.com" cc "cc@example.com" bcc "bcc@example.com" and the subject "SUBJECT" and the attachments "attached_file.pdf"
-      """
-
-     # Test with wrong conditions
-    Then the following multiline step should fail:
-      """
-      Then an email should have been sent from "from@example.com" to "to@example.com" cc "cc@example.com" bcc "wrong_bcc@example.com" and the subject "SUBJECT" and the attachments "attached_file.pdf"
-      """
-
-  Scenario: /^that e?mail should have the following lines in the body:$/
-    When I go to "/emails/send_email"
-
-    # Test with correct body lines
-    Then the following multiline step should succeed:
-      """
-      Then that email should have the following lines in the body:
-        '''
         with
         line
         '''
       """
 
-    # Test with wrong body lines
+    # Test body with wildcard not at the end of a line
     Then the following multiline step should fail:
       """
-      Then that email should have the following lines in the body:
-        '''
-        wrong
-        line
-        '''
-      """
-
-
-  Scenario: /^that e?mail should have the following( content in the)? body$/
-    When I go to "/emails/send_email"
-
-      # Test with correct body lines
-    Then the following multiline step should succeed:
-      """
-      Then that email should have the following content in the body:
-        '''
-        with
-        line
+      Then an email should have been sent with:
         '''
-      """
+        From: from@example.com
+        Reply-To: reply-to@example.com
+        To: to@example.com
+        Subject: SUBJECT
 
-       # Test with wrong body lines
-    Then the following multiline step should fail:
-      """
-      Then that email should have the following body:
-        '''
-        wrong
+        Body
+        *th
         line
+        break
         '''
       """
 
@@ -332,6 +286,165 @@ Feature: Test Spreewald's email steps
         '''
       """
 
+    When I clear my emails
+      And I go to "/emails/send_html_email_with_specific_line"
+
+    Then the following multiline step should succeed:
+     """
+      Then an email should have been sent with:
+        '''
+        From: from@example.com
+        Reply-To: reply-to@example.com
+        To: to@example.com
+        Subject: SUBJECT
+
+        Lorem ipsum dolor sit amet, consetetur sadipscing elitr*
+        *VERY IMPORTANT SENTENCE*
+        Ut wisi enim ad minim veniam*
+        '''
+      """
+
+    When I clear my emails
+      And I go to "/emails/send_text_email_with_specific_line"
+
+    Then the following multiline step should succeed:
+     """
+      Then an email should have been sent with:
+        '''
+        From: from@example.com
+        Reply-To: reply-to@example.com
+        To: to@example.com
+        Subject: SUBJECT
+
+        Lorem ipsum dolor sit amet, consetetur sadipscing elitr*
+
+        *VERY IMPORTANT SENTENCE*
+
+        Ut wisi enim ad minim veniam*
+        '''
+      """
+
+    # Tests without header
+    When I clear my emails
+      And I go to "/emails/send_text_email_for_successful_test_without_header"
+    Then the following multiline step should succeed:
+      """
+      Then an email should have been sent with:
+        '''
+        Hello
+
+        Bye
+        '''
+      """
+      And the following multiline step should succeed:
+        """
+        Then an email should have been sent with:
+          '''
+          To: to@example.com
+
+          Hello
+
+          Bye
+          '''
+        """
+    But the following multiline step should fail:
+      """
+      Then an email should have been sent with:
+        '''
+        To: wrong-guy@example.com
+
+        Hello
+
+        Bye
+        '''
+      """
+
+    When I clear my emails
+      And I go to "/emails/send_text_email_for_failed_test_without_header"
+    Then the following multiline step should fail:
+      """
+      Then an email should have been sent with:
+        '''
+        Hello
+
+        Bye
+        '''
+      """
+    But the following multiline step should succeed:
+      """
+      Then an email should have been sent with:
+        '''
+        Bye
+        '''
+      """
+      And the following multiline step should succeed:
+        """
+        Then an email should have been sent with:
+          '''
+          To: to@example.com
+
+          Bye
+          '''
+        """
+
+    When I clear my emails
+      And I go to "/emails/send_html_email_for_successful_test_without_header"
+    Then the following multiline step should succeed:
+      """
+      Then an email should have been sent with:
+        '''
+        Hello
+        Bye
+        '''
+      """
+      And the following multiline step should succeed:
+        """
+        Then an email should have been sent with:
+          '''
+          To: to@example.com
+
+          Hello
+          Bye
+          '''
+        """
+    But the following multiline step should fail:
+      """
+      Then an email should have been sent with:
+        '''
+        To: wrong-guy@example.com
+
+        Hello
+        Bye
+        '''
+      """
+
+    When I clear my emails
+      And I go to "/emails/send_html_email_for_failed_test_without_header"
+    Then the following multiline step should fail:
+      """
+      Then an email should have been sent with:
+        '''
+        Hello
+        Bye
+        '''
+      """
+    But the following multiline step should succeed:
+      """
+      Then an email should have been sent with:
+        '''
+        Bye
+        '''
+      """
+      And the following multiline step should succeed:
+        """
+        Then an email should have been sent with:
+          '''
+          To: to@example.com
+
+          Bye
+          '''
+        """
+
   Scenario: /^I follow the (first|second|third)? ?link in the e?mail$/ (HTML e-mail body)
     When I go to "/emails/send_html_email_with_links"
       And I follow the first link in the email

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

@@ -4,6 +4,7 @@ Feature: Web steps
     When I go to "/forms/form1"
     Then the "Text control" field should contain "Text control value"
     Then the "Text control" field should not contain "false text"
+    Then the "Disabled text control" field should contain "Disabled text control value"
     Then the "Select control" field should contain "Label 2"
     Then the "Select control without selection" field should contain "Label 1"
     Then the "Textarea control" field should contain "Textarea control value"
@@ -35,17 +36,14 @@ Feature: Web steps
     When I go to "/forms/invalid_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
 
   Scenario: /^the "([^"]*)" field should have the error "([^"]*)"$/
     When I go to "/forms/invalid_form"
     Then the "A" field should have the error "is invalid"
     Then the "B" field should have the error "is invalid"
-
-
-  Scenario: /^the "([^"]*)" field should have no error$/
-    When I go to "/forms/invalid_form"
-    Then the "C" field should have no error
+    Then the "Disabled" field should have the error "is invalid"
 
 
   Scenario: /^I should see a form with the following values:$/
@@ -93,6 +91,7 @@ Feature: Web steps
   Scenario: /^the "([^"]*)" checkbox should( not)? be checked$/
     When I go to "/forms/checkbox_form"
     Then the "Checked" checkbox should be checked
+      And the "Checked disabled" checkbox should be checked
       And the "Unchecked" checkbox should not be checked
 
 
@@ -135,7 +134,7 @@ Feature: Web steps
       But the "unsorted" select should not be sorted
 
 
-  Scenario: /^Then (the tag )?"..." should( not)? be visible$/
+  Scenario: /^Then (the tag )?"..." should be visible$/
     When I go to "/static_pages/visibility"
     Then "hidden ümläüt" should be hidden
       And "visible ümläüt" should be visible
@@ -145,13 +144,13 @@ Feature: Web steps
 
 
   @javascript
-  Scenario: /^Then (the tag )?"..." should( not)? be visible$/ with javascript
+  Scenario: /^Then (the tag )?"..." should be visible$/ with javascript
     When I go to "/static_pages/visibility"
-    Then "hidden ümläüt" should not be visible
+    Then "hidden ümläüt" should be hidden
       And "visible ümläüt" should be visible
       And a hidden string with quotes should not be visible
       And a visible string with quotes should be visible
-      And "hidden ümläüt" should not be visible
+      And "hidden ümläüt" should be hidden
 
 
   Scenario: /^the "([^\"]*)" field should( not)? be visible$/
@@ -161,7 +160,7 @@ Feature: Web steps
 
   Scenario: /^the "([^\"]*)" field should( not)? be visible within (.*[^:])$/
     When I go to "/static_pages/visibility"
-    Then "content" should not be visible within ".inside"
+    Then "content" should be hidden within ".inside"
       But "content" should be visible within ".outside"
 
   @javascript
@@ -302,6 +301,12 @@ Feature: Web steps
       And I should not see a link labeled "First visible link" within ".unrelated-element"
 
 
+  Scenario: /^I should( not)? see a field "([^"]*)"$/
+    When I go to "/forms/disabled_elements"
+    Then I should see a field "Enabled field #1"
+      And I should see a field "Disabled field #1"
+
+
   Scenario: /^I should( not)? see the (?:number|amount) ([\-\d,\.]+)(?: (.*?))?$/
     When I am on "/static_pages/numbers"
     Then I should see the number 1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spreewald
 version: !ruby/object:Gem::Version
-  version: 2.99.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Tobias Kraze
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-04 00:00:00.000000000 Z
+date: 2021-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -157,11 +157,9 @@ files:
 - lib/spreewald/browser_tab_steps.rb
 - lib/spreewald/development_steps.rb
 - lib/spreewald/email_steps.rb
-- lib/spreewald/file_attachment_steps.rb
 - lib/spreewald/session_steps.rb
 - lib/spreewald/table_steps.rb
 - lib/spreewald/time_steps.rb
-- lib/spreewald/timecop_steps.rb
 - lib/spreewald/web_steps.rb
 - lib/spreewald_support/comparison.rb
 - lib/spreewald_support/compatibility.rb
@@ -350,9 +348,15 @@ files:
 - tests/shared/app/views/mailer/email.text.erb
 - tests/shared/app/views/mailer/email_crlf.text.erb
 - tests/shared/app/views/mailer/email_with_umlauts.text.erb
+- tests/shared/app/views/mailer/html_email_for_failed_test_without_header.haml
+- tests/shared/app/views/mailer/html_email_for_successful_test_without_header.haml
 - tests/shared/app/views/mailer/html_email_with_linebreaks.html
 - tests/shared/app/views/mailer/html_email_with_links.haml
+- tests/shared/app/views/mailer/html_email_with_specific_line.haml
+- tests/shared/app/views/mailer/text_email_for_failed_test_without_header.text.erb
+- tests/shared/app/views/mailer/text_email_for_successful_test_without_header.text.erb
 - tests/shared/app/views/mailer/text_email_with_links.text.erb
+- tests/shared/app/views/mailer/text_email_with_specific_line.text.erb
 - tests/shared/app/views/spreewald_mailer
 - tests/shared/app/views/static_pages/click_on.html.haml
 - tests/shared/app/views/static_pages/home.html.haml
@@ -584,9 +588,15 @@ test_files:
 - tests/shared/app/views/mailer/email.text.erb
 - tests/shared/app/views/mailer/email_crlf.text.erb
 - tests/shared/app/views/mailer/email_with_umlauts.text.erb
+- tests/shared/app/views/mailer/html_email_for_failed_test_without_header.haml
+- tests/shared/app/views/mailer/html_email_for_successful_test_without_header.haml
 - tests/shared/app/views/mailer/html_email_with_linebreaks.html
 - tests/shared/app/views/mailer/html_email_with_links.haml
+- tests/shared/app/views/mailer/html_email_with_specific_line.haml
+- tests/shared/app/views/mailer/text_email_for_failed_test_without_header.text.erb
+- tests/shared/app/views/mailer/text_email_for_successful_test_without_header.text.erb
 - tests/shared/app/views/mailer/text_email_with_links.text.erb
+- tests/shared/app/views/mailer/text_email_with_specific_line.text.erb
 - tests/shared/app/views/spreewald_mailer
 - tests/shared/app/views/static_pages/click_on.html.haml
 - tests/shared/app/views/static_pages/home.html.haml

data/lib/spreewald/file_attachment_steps.rb

@@ -1,22 +0,0 @@
-# This step is deprecated and will be removed from spreewald. If you still want to use it, copy the code to your project's own steps.
-Given /^the file "([^"]*)" was attached(?: as (?:([^"]*)\/)?([^"]*))? to the ([^"]*) above(?: at "([^"]*)")?$/ do
-  |path_to_file, container_name, relation_name, model_name, time_string|
-
-  warn "The step 'the file ... was attached to the ... above' will soon be removed from Spreewald, because we want Spreewald to be a library of steps that interact with a user interface and instead of manipulating the database directly. If you wish to further use this step please copy it over to your project's own steps."
-
-  object = model_name.camelize.constantize.last
-  time = Time.parse(time_string) if time_string.present?
-  relation_name ||= 'file'
-
-  if container_name.present?
-    container = container_name.camelize.constantize.new # Image.file = File... owner: gallery
-    container.owner = object
-    container.created_at = time if time
-  else
-    container = object # Person.avatar = File...
-  end
-
-  container.send("#{relation_name}=", File.new(path_to_file))
-  container.updated_at = time if time
-  container.save!
-end.overridable

data/lib/spreewald/timecop_steps.rb

@@ -1,9 +0,0 @@
-# nodoc
-# FILE_COMMENT_END
-
-warn <<-WARNING
-Warning: The file spreewald/timecop_steps.rb is deprecated. It was moved to
-spreewald/time_steps.rb. Please require the new file instead.
-WARNING
-
-require 'spreewald/time_steps'