spreewald 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbbb1aa373a4a39fef3fa0919d4d93e1b8e2410a
-  data.tar.gz: 324f16cba03ab1e80147a95da42a39a24421dd14
+  metadata.gz: ddb7fc3c104b505b8cb94e2cbd378f0e53a2a659
+  data.tar.gz: ff225609365e6c13e81a987ebd3033dd1558b14b
 SHA512:
-  metadata.gz: 755e1efa4859d6e3e749f005e69917719a95a9e45cdbc3358c90b0f12997b2e0501d944a243bc03467701f2fa5ea1a1bf80127af6791271e36f343a231ac1839
-  data.tar.gz: 1ac713920860234a6b39b2c3fc14de320ff09d4b5634fa757233f63107038a19d042b2004a1bf8e00e9ad06e7539b128bbd82cf50cb04f47569b302cc590dea9
+  metadata.gz: 6b8bf83b6e5a7b573c311b79ddc6f3677e9fbb2f60a4d61fc7fccb806a43f210e5b82e6e2ff23b15faa2c86ccc828da021bc6a5da681adb36743c82aad6c8e99
+  data.tar.gz: f0f3f6c77b2bc6977a41bca49662b65564511001b6abe472488cb1d98dd2f25cb8ba9e5e32247279eff4c4a155a94607bc69d7627fd9fe8aeb133a0f468133fc

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).
 
+## 2.2.3
+- Fix 'the window should be titled' step - closes: [#102](https://github.com/makandra/spreewald/issues/102)
+- Support old capybara_screenshot versions which require launchy gem
+
 ## 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

data/README.md

@@ -171,15 +171,13 @@ the step definitions.
         Message body goes here.
         """
   
-  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
+  You may 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 may also be
   a prefix.
 
 
 * **When I follow the (first|second|third)? link in the e?mail**
 
-  Only works after you have retrieved the mail using "Then an email should have been sent with:"
-
 
 * **Then no e?mail should have been sent**
 
@@ -204,12 +202,12 @@ the step definitions.
         need to be present
         """
   
-  You can skip lines, of course. Note that the lines are only checked for _inclusion_.
+  You may skip lines, of course. Note that you may also omit text at the end of each line.
 
 
 * **Then that e?mail should have the following (|content in the )body:**
 
-  Checks that the text should be included in the retrieved email
+  Checks that the text should be included anywhere in the retrieved email body
 
 
 ### file_attachment_steps.rb 

data/examples/paths.rb

@@ -1,4 +1,4 @@
-# Put this into features/support and require it in your env.rb
+# Put this into features/support
 #
 module NavigationHelpers
   # Maps a name to a path. Used by the

data/examples/selectors.rb

@@ -1,4 +1,4 @@
-# Put this into features/support and require it in your env.rb
+# Put this into features/support
 module HtmlSelectorsHelpers
   # Maps a name to a selector. Used primarily by the
   #

data/lib/spreewald/all_steps.rb

@@ -1,4 +1,5 @@
 # coding: UTF-8
+require 'rspec/matchers'
 
 Dir[File.join(File.dirname(__FILE__), '*_steps.rb')].each do |f|
   name = File.basename(f, '.rb')

data/lib/spreewald/email_steps.rb

@@ -23,8 +23,8 @@ end.overridable
 #       Message body goes here.
 #       """
 #
-# 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
+# You may 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 may also be
 # a prefix.
 Then /^(an|no) e?mail should have been sent with:$/ do |mode, raw_data|
   patiently do
@@ -61,7 +61,6 @@ Then /^(an|no) e?mail should have been sent((?: |and|with|from "[^"]+"|bcc "[^"]
   end
 end.overridable
 
-# Only works after you have retrieved the mail using "Then an email should have been sent with:"
 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]
@@ -102,7 +101,7 @@ end.overridable
 #       need to be present
 #       """
 #
-# You can skip lines, of course. Note that the lines are only checked for _inclusion_.
+# You may skip lines, of course. Note that you may also omit text at the end of each line.
 Then /^that e?mail should( not)? have the following lines in the body:$/ do |negate, body|
   expectation = negate ? 'not_to' : 'to'
   mail = @mail || ActionMailer::Base.deliveries.last
@@ -113,7 +112,7 @@ Then /^that e?mail should( not)? have the following lines in the body:$/ do |neg
   end
 end.overridable
 
-# Checks that the text should be included in the retrieved email
+# Checks that the text should be included anywhere in the retrieved email body
 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)

data/lib/spreewald/web_steps.rb

@@ -30,6 +30,7 @@ require 'spreewald_support/step_fallback'
 require 'spreewald_support/custom_matchers'
 require 'spreewald_support/web_steps_helpers'
 require 'spreewald_support/driver_info'
+require 'spreewald_support/comparison'
 require 'uri'
 require 'cgi'
 
@@ -408,7 +409,7 @@ Then /^the "([^"]*)" checkbox should( not)? be checked( and disabled)?$/ do |lab
   expectation = negate ? :not_to : :to
 
   patiently do
-    field = if Capybara::VERSION < "2.1"
+    field = if Spreewald::Comparison.compare_versions(Capybara::VERSION, :<, "2.1")
       find_field(label)
     else
       find_field(label, :disabled => !!disabled)
@@ -443,10 +444,10 @@ end.overridable
 
 # Open the current Capybara page using the `launchy` or `capybara_screenshot` gem
 Then /^show me the page$/ do
-  if defined? Launchy
-    save_and_open_page
-  elsif defined? Capybara::Screenshot
+  if defined? Capybara::Screenshot
     screenshot_and_save_page
+  elsif defined? Launchy
+    save_and_open_page
   else
     raise 'Neither launchy nor capybara_screenshot gem is installed. You have to add at least one of them to your Gemfile to use this step'
   end
@@ -484,7 +485,7 @@ end.overridable
 
 # Checks for the presence of an option in a select
 Then /^"([^"]*)" should( not)? be an option for "([^"]*)"$/ do |value, negate, field|
-  finder_arguments = if Capybara::VERSION < "2.12"
+  finder_arguments = if Spreewald::Comparison.compare_versions(Capybara::VERSION, :<, "2.12")
     ['option', { :text => value }]
   else
     ['option', { :exact_text => value }]
@@ -503,7 +504,11 @@ end.overridable
 
 Then /^the window should be titled "([^"]*)"$/ do |title|
   patiently do
-    expect(pag).to have_css('title', :text => title)
+    if Spreewald::Comparison.compare_versions(Capybara::VERSION, :<, "2.1")
+      expect(page).to have_selector("title", :content => title)
+    else
+      expect(page).to have_title(title)
+    end
   end
 end.overridable
 
@@ -664,7 +669,7 @@ 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|
-  if Gem::Version.new(Capybara::VERSION) < Gem::Version.new("2.1")
+  if Spreewald::Comparison.compare_versions(Capybara::VERSION, :<, "2.1")
     if kind == 'field' || kind == 'checkbox'
       element = find_field(label)
     else
@@ -683,7 +688,7 @@ end.overridable
 
 # Tests that a field with the given label is visible.
 Then /^the "([^\"]*)" field should( not)? be visible$/ do |label, hidden|
-  if Capybara::VERSION < "2.1"
+  if Spreewald::Comparison.compare_versions(Capybara::VERSION, :<, "2.1")
     field = find_field(label)
   else
     # Capybara 2.1+ won't usually interact with hidden elements,

data/lib/spreewald_support/comparison.rb

@@ -0,0 +1,9 @@
+module Spreewald
+  module Comparison
+
+    def self.compare_versions(gem_version, operator, compare_to)
+      Gem::Version.new(gem_version).send(operator, Gem::Version.new(compare_to))
+    end
+
+  end
+end

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}/blob/master/examples/selectors.rb)"
+        "Add 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}/blob/master/examples/paths.rb)"
+          "Add 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.2'
+  VERSION = '2.2.3'
 end

data/spec/spreewald_support/comparision_spec.rb

@@ -0,0 +1,12 @@
+require 'spreewald_support/comparison'
+
+describe Spreewald::Comparison do
+
+  describe 'compare_versions' do
+    it 'returns true for `2.4.0 < 2.12` ' do
+      comp = Spreewald::Comparison.compare_versions('2.4.0', :<, '2.12')
+      expect(comp).to be_truthy
+    end
+  end
+
+end

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

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

data/tests/rails-4_capybara-3/features/step_definitions/test_steps.rb

@@ -46,7 +46,7 @@ end
 
 Then(/^'show me the page' should open the page or take a screenshot$/) do
   # Projects with Capybara 1 & 2 use the launchy gem
-  if Capybara::VERSION < "3.0"
+  if Spreewald::Comparison.compare_versions(Capybara::VERSION, :<, "3.0")
     expect(Launchy).to receive(:open)
     step 'show me the page'
   else

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

@@ -293,3 +293,8 @@ Feature: Web steps
       And the "Disabled field #3" field should be disabled
     But the "Enabled field #1" field should not be disabled
       And the "Enabled field #2" field should not be disabled
+
+
+  Scenario: /^the window should be titled "([^"]*)"$/
+    When I go to "/static_pages/home"
+    Then the window should be titled "spreewald test application"

data/tests/shared/app/views/layouts/application.html.haml

@@ -1,5 +1,7 @@
 !!!
 %html
   %head
+    %title
+      = "spreewald test application"
   %body
     = yield

data/tests/shared/features/shared/step_definitions/test_steps.rb

@@ -46,7 +46,7 @@ end
 
 Then(/^'show me the page' should open the page or take a screenshot$/) do
   # Projects with Capybara 1 & 2 use the launchy gem
-  if Capybara::VERSION < "3.0"
+  if Spreewald::Comparison.compare_versions(Capybara::VERSION, :<, "3.0")
     expect(Launchy).to receive(:open)
     step 'show me the page'
   else

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

@@ -293,3 +293,8 @@ Feature: Web steps
       And the "Disabled field #3" field should be disabled
     But the "Enabled field #1" field should not be disabled
       And the "Enabled field #2" field should not be disabled
+
+
+  Scenario: /^the window should be titled "([^"]*)"$/
+    When I go to "/static_pages/home"
+    Then the window should be titled "spreewald test application"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spreewald
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors:
 - Tobias Kraze
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-04 00:00:00.000000000 Z
+date: 2019-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -158,6 +158,7 @@ files:
 - lib/spreewald/table_steps.rb
 - lib/spreewald/timecop_steps.rb
 - lib/spreewald/web_steps.rb
+- lib/spreewald_support/comparison.rb
 - lib/spreewald_support/compatibility.rb
 - lib/spreewald_support/custom_matchers.rb
 - lib/spreewald_support/driver_info.rb
@@ -169,6 +170,7 @@ files:
 - lib/spreewald_support/version.rb
 - lib/spreewald_support/web_steps_helpers.rb
 - spec/spec_helper.rb
+- spec/spreewald_support/comparision_spec.rb
 - spec/spreewald_support/tolerance_for_selenium_sync_issues_spec.rb
 - spec/support/world.rb
 - spreewald.gemspec