spreewald 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 356289403f9035cb4de73481fbe3fe874dfaa64e
-  data.tar.gz: eb92d6018a939b0ac4046323e69b14a05435a556
+  metadata.gz: dbbb1aa373a4a39fef3fa0919d4d93e1b8e2410a
+  data.tar.gz: 324f16cba03ab1e80147a95da42a39a24421dd14
 SHA512:
-  metadata.gz: 045cf38593b6bc640a02474401d5416a06310045e53b26dfe0a9b834cfb3d4114fd0b93ee522a886fd346fd0bf502ef356f0fe3f481eb024717f96bedafc0ecf
-  data.tar.gz: b0891a0aa08f0e811cad30834965edfd939b58d2b3b5255af7c8b3a6875a4045092c838ceaa2cbf78499944ac8e8d628a3b572bfed3fde69117c68ff5a16b191
+  metadata.gz: 755e1efa4859d6e3e749f005e69917719a95a9e45cdbc3358c90b0f12997b2e0501d944a243bc03467701f2fa5ea1a1bf80127af6791271e36f343a231ac1839
+  data.tar.gz: 1ac713920860234a6b39b2c3fc14de320ff09d4b5634fa757233f63107038a19d042b2004a1bf8e00e9ad06e7539b128bbd82cf50cb04f47569b302cc590dea9

data/.gitignore

@@ -11,3 +11,4 @@ InstalledFiles
 tmp
 _yardoc
 *.log
+tests/shared/db/test.sqlite3

data/CHANGELOG.md

@@ -3,6 +3,11 @@ 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.2
+- Fix `Then the "something" button should be disabled` (see issue [#18](https://github.com/makandra/spreewald/issues/18))
+- Improve documentation of emails steps
+- Clarify step definition of `that e?mail should have the following (?:|content in the )body:`
+
 ## 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

data/README.md

@@ -171,8 +171,9 @@ the step definitions.
         Message body goes here.
         """
   
-  You can skip lines, of course. Note that the mail body is only checked for
-  _inclusion_.
+  You can skip lines in the header, of course. Note that the mail body is only checked for
+  _inclusion_. That means you can only test a prefix of the body. The subject can also be
+  a prefix.
 
 
 * **When I follow the (first|second|third)? link in the e?mail**
@@ -195,8 +196,6 @@ the step definitions.
 
 * **Then that e?mail should( not)? have the following lines in the body:**
 
-  Only works after you've retrieved the email using "Then an email should have been sent with:"
-  
   Example:
   
       And that mail should have the following lines in the body:
@@ -204,11 +203,12 @@ the step definitions.
         All of these lines
         need to be present
         """
+  
+  You can skip lines, of course. Note that the lines are only checked for _inclusion_.
 
 
-* **Then that e?mail should have the following body:**
+* **Then that e?mail should have the following (|content in the )body:**
 
-  Only works after you've retrieved the email using "Then an email should have been sent with:"
   Checks that the text should be included in the retrieved email
 
 
@@ -656,7 +656,7 @@ deprecation notice. Decide for yourself whether you want to use them:
 
 * **Then the "..." (field|button|checkbox) should( not)? be disabled**
 
-  Tests that an input or button with the given label is disabled.
+  Tests that an input, button or checkbox with the given label is disabled.
 
 
 * **Then the "..." field should( not)? be visible**

data/lib/spreewald/email_steps.rb

@@ -23,8 +23,9 @@ end.overridable
 #       Message body goes here.
 #       """
 #
-# You can skip lines, of course. Note that the mail body is only checked for
-# _inclusion_.
+# You can skip lines in the header, of course. Note that the mail body is only checked for
+# _inclusion_. That means you can only test a prefix of the body. The subject can also be
+# a prefix.
 Then /^(an|no) e?mail should have been sent with:$/ do |mode, raw_data|
   patiently do
     raw_data.strip!
@@ -93,8 +94,6 @@ Then /^show me the e?mails$/ do
   end
 end.overridable
 
-# Only works after you've retrieved the email using "Then an email should have been sent with:"
-#
 # Example:
 #
 #     And that mail should have the following lines in the body:
@@ -102,17 +101,20 @@ end.overridable
 #       All of these lines
 #       need to be present
 #       """
+#
+# You can skip lines, of course. Note that the lines are only checked for _inclusion_.
 Then /^that e?mail should( not)? have the following lines in the body:$/ do |negate, body|
   expectation = negate ? 'not_to' : 'to'
-  email_text_body = MailFinder.email_text_body(@mail)
+  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
 
-# Only works after you've retrieved the email using "Then an email should have been sent with:"
 # Checks that the text should be included in the retrieved email
-Then /^that e?mail should have the following body:$/ do |body|
-  expect(MailFinder.email_text_body(@mail)).to include(body.strip)
+Then /^that e?mail should have the following (?:|content in the )body:$/ do |body|
+  mail = @mail || ActionMailer::Base.deliveries.last
+  expect(MailFinder.email_text_body(mail)).to include(body.strip)
 end.overridable

data/lib/spreewald/web_steps.rb

@@ -662,18 +662,23 @@ When /^I switch to the new tab$/ do
   end
 end.overridable
 
-# Tests that an input or button with the given label is disabled.
+# 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|
-  if kind == 'field' || kind == 'checkbox'
-    if Capybara::VERSION < "2.1"
-      element = find_field(label, :disabled => !negate)
+  if Gem::Version.new(Capybara::VERSION) < Gem::Version.new("2.1")
+    if kind == 'field' || kind == 'checkbox'
+      element = find_field(label)
     else
-      element = find_field(label, :disabled => !negate)
+      element = find_button(label)
     end
+    expect(element[:disabled]).send(negate ? :to : :not_to, eq(nil))
   else
-    element = find_button(label)
+    if kind == 'field' || kind == 'checkbox'
+      element = find_field(label, disabled: !negate)
+    else
+      element = find_button(label, disabled: !negate)
+    end
+    expect(element).to be_present
   end
-  expect(["false", "", nil]).send(negate ? :not_to : :to, include(element[:disabled]))
 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.2.1'
+  VERSION = '2.2.2'
 end

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

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

data/tests/rails-3_capybara-1/config/cucumber.yml

@@ -0,0 +1,2 @@
+default: --require features --require features/shared features/shared
+

data/tests/rails-3_capybara-1/config/database.yml

@@ -0,0 +1,7 @@
+development:
+  adapter: sqlite3
+  database: ":memory:"
+
+test:
+  adapter: sqlite3
+  database: ":memory:"

data/tests/rails-3_capybara-1/features/support/paths.rb

@@ -0,0 +1,16 @@
+module NavigationHelpers
+  
+  def path_to(page_name)
+    case page_name
+    when /^"(.*)"$/
+      $1
+
+    else
+      raise "Can't find mapping from \"#{page_name}\" to a path.\n" +
+        "Now, go and add a mapping in #{__FILE__}"
+    end
+  end
+  
+end
+
+World(NavigationHelpers)

data/tests/rails-3_capybara-1/features/support/selectors.rb

@@ -0,0 +1,52 @@
+module HtmlSelectorsHelpers
+  # Maps a name to a selector. Used primarily by the
+  #
+  #   When /^(.+) within (.+)$/ do |step, scope|
+  #
+  # step definitions in web_steps.rb
+  #
+  def selector_for(locator)
+    case locator
+
+    when /^a panel?$/
+      '.panel'
+
+    when /^a panels nested contents?$/
+      '.panel--nested-contents'
+
+    when /^the timeline?$/
+      '.timeline'
+
+    when /^the table row containing "(.+?)"$/
+      all('tr').detect { |tr| tr.text.include? $1 } || raise("Could not find tr containing #{$1.inspect}")
+
+    when /^a table$/
+      '.table'
+
+      # Add more mappings here.
+      # Here is an example that pulls values out of the Regexp:
+      #
+      #  when /^the (notice|error|info) flash$/
+      #    ".flash.#{$1}"
+
+      # You can also return an array to use a different selector
+      # type, like:
+      #
+      #  when /the header/
+      #    [:xpath, "//header"]
+
+      # This allows you to provide a quoted selector as the scope
+      # for "within" steps as was previously the default for the
+      # web steps:
+    when /^"(.+)"$/
+      $1
+
+    else
+      raise "Can't find mapping from \"#{locator}\" to a selector.\n" +
+              "Now, go and add a mapping in #{__FILE__}"
+    end
+  end
+
+end
+
+World(HtmlSelectorsHelpers)

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

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

data/tests/rails-3_capybara-2/Rakefile

@@ -0,0 +1,18 @@
+#!/usr/bin/env rake
+require 'cucumber/rake/task'
+
+desc 'Default: Run all specs for a specific rails version.'
+task :default => :features
+
+desc 'Run all specs for rails 3.2'
+Cucumber::Rake::Task.new(:features) do |t|
+  feature = if ENV['SINGLE_FEATURE']
+    "../../shared/features/shared/#{ ENV['SINGLE_FEATURE'] }"
+  else
+    'features/shared'
+  end
+
+  # tell cucumber where it finds it files (subdirectories and symlinks are confusing it)
+  t.cucumber_opts = "--require features --require features/shared #{feature}"
+end
+

data/tests/rails-3_capybara-2/config.ru

@@ -0,0 +1,4 @@
+# This file is used by Rack-based servers to start the application.
+
+require ::File.expand_path('../config/environment',  __FILE__)
+run SpreewaldTest::Application

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

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

data/tests/rails-4_capybara-3/features/development_steps.feature

@@ -0,0 +1,8 @@
+Feature: Development steps
+
+  Scenario: /^it should work(.+?)?$/ (without a reason)
+    Then it should work
+
+  Scenario: /^it should work(.+?)?$/ (with a given reason)
+    Then it should work once the blocker described here was fulfilled. (Feature should be pending)
+

data/tests/rails-4_capybara-3/features/email_steps.feature

@@ -0,0 +1,216 @@
+Feature: Test Spreewald's email steps
+  
+  Scenario: /^no e?mail should have been sent$/
+    When I go to "/emails/do_nothing"
+    Then the following step should succeed:
+      | no email should have been sent |
+  
+    When I go to "/emails/send_email"
+    Then the following step should fail:
+      | no email should have been sent |
+
+
+  Scenario: /^I should see "([^\"]*)" in the e?mail$/
+    When I go to "/emails/send_email"
+    Then the following step should succeed:
+      | I should see "Body" in the email |
+    But the following step should fail:
+      | I should see "XYZ" in the email |
+
+
+  Scenario: /^(an|no) e?mail should have been sent with:$/
+    When I go to "/emails/send_email"
+
+    # Test without body
+    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
+        '''
+      """
+
+    # Test with body
+    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
+
+        Body
+        with
+        line
+        breaks
+        '''
+      """
+
+    # Test with incorrect From header
+    Then the following multiline step should fail:
+      """
+      Then an email should have been sent with:
+        '''
+        From: other-from@example.com
+        Reply-To: reply-to@example.com
+        To: to@example.com
+        Subject: SUBJECT
+
+        Body
+        with
+        line
+        breaks
+        '''
+      """
+
+    # Test with incorrect Reply-To header
+    Then the following multiline step should fail:
+      """
+      Then an email should have been sent with:
+        '''
+        From: from@example.com
+        Reply-To: other-reply-to@example.com
+        To: to@example.com
+        Subject: SUBJECT
+
+        Body
+        with
+        line
+        breaks
+        '''
+      """
+    # Test with incorrect To header
+    Then the following multiline step should fail:
+      """
+      Then an email should have been sent with:
+        '''
+        From: from@example.com
+        Reply-To: reply-to@example.com
+        To: other-to@example.com
+        Subject: SUBJECT
+
+        Body
+        with
+        line
+        breaks
+        '''
+      """
+
+    # Test with incorrect Subject header
+    Then the following multiline step should fail:
+      """
+      Then an email should have been sent with:
+        '''
+        From: from@example.com
+        Reply-To: reply-to@example.com
+        To: to@example.com
+        Subject: OTHER-SUBJECT
+
+        Body
+        with
+        line
+        breaks
+        '''
+      """
+
+    # Test with incorrect body
+    Then the following multiline step should fail:
+      """
+      Then an email should have been sent with:
+        '''
+        From: from@example.com
+        Reply-To: reply-to@example.com
+        To: to@example.com
+        Subject: SUBJECT
+
+        Other body
+        with
+        line
+        breaks
+        '''
+      """
+
+    # Test body with multiple paragraphs
+    Then the following multiline step should fail:
+      """
+      Then an email should have been sent with:
+        '''
+        From: from@example.com
+        Reply-To: reply-to@example.com
+        To: to@example.com
+        Subject: SUBJECT
+
+        Body
+        with
+        line
+        breaks
+        
+        MORE-BODY
+        '''
+      """
+
+  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
+    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
+        '''
+      """
+
+       # Test with wrong body lines
+    Then the following multiline step should fail:
+      """
+      Then that email should have the following body:
+        '''
+        wrong
+        line
+        '''
+      """