spreewald 0.1.4 → 0.1.5

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.idea

data/lib/spreewald/all_steps.rb

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

data/lib/spreewald/development_steps.rb

@@ -1,4 +1,4 @@
-#
+# coding: UTF-8
 
 # Marks scenario as pending
 Then /^it should work$/ do

data/lib/spreewald/email_steps.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 require 'spreewald_support/mail_finder'
 
 Before do
@@ -36,7 +38,7 @@ Then /^(an|no) e?mail should have been sent with:$/ do |mode, raw_data|
 end
 
 # nodoc
-Then /^(an|no) e?mail should have been sent((?: |and|with|from "[^"]+"|to "[^"]+"|the subject "[^"]+"|the body "[^"]+"|the attachments "[^"]+")+)$/ do |mode, query|
+Then /^(an|no) e?mail should have been sent((?: |and|with|from "[^"]+"|bcc "[^"]+"|to "[^"]+"|the subject "[^"]+"|the body "[^"]+"|the attachments "[^"]+")+)$/ do |mode, query|
   conditions = {}
   conditions[:to] = $1 if query =~ /to "([^"]+)"/
   conditions[:cc] = $1 if query =~ / cc "([^"]+)"/
@@ -54,7 +56,7 @@ end
 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]
-  visit mail.body.to_s.scan(Patterns::URL)[index][2]
+  visit MailFinder.email_text_body(mail).to_s.scan(Patterns::URL)[index][2]
 end
 
 Then /^no e?mail should have been sent$/ do
@@ -63,7 +65,7 @@ end
 
 # Checks that the last sent email includes some text
 Then /^I should see "([^\"]*)" in the e?mail$/ do |text|
-  ActionMailer::Base.deliveries.last.body.should include(text)
+  MailFinder.email_text_body(ActionMailer::Base.deliveries.last).should include(text)
 end
 
 # Print all sent emails to STDOUT.

data/lib/spreewald/table_steps.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 # Check the content of tables in your HTML.
 # 
 # See [this article](https://makandracards.com/makandra/763-cucumber-step-to-match-table-rows-with-capybara) for details.
@@ -29,7 +31,7 @@ module TableStepsHelper
     end
 
     def normalize_content(content)
-      nbsp = 0xC2.chr + 0xA0.chr
+      nbsp = " "
       content.gsub(/[\r\n\t]+/, ' ').gsub(nbsp, ' ').gsub(/ {2,}/, ' ').strip
     end
 

data/lib/spreewald/timecop_steps.rb

@@ -1,3 +1,6 @@
+# coding: UTF-8
+
+
 # Steps to travel through time using [Timecop](https://github.com/jtrupiano/timecop).
 # 
 # See [this article](https://makandracards.com/makandra/1222-useful-cucumber-steps-to-travel-through-time-with-timecop) for details.

data/lib/spreewald/web_steps.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 # Most of cucumber-rails' original web steps plus a few of our own. 
 #
 # Note that cucumber-rails deprecated all its steps quite a while ago with the following
@@ -62,14 +64,14 @@ When /^(?:|I )follow "([^"]*)"$/ do |link|
 end
 
 # Fill in text field
-When /^(?:|I )fill in "([^"]*)" with "([^"]*)"$/ do |field, value|
+When /^(?:|I )fill in "([^"]*)" (?:with|for) "([^"]*)"$/ do |field, value|
   patiently do
     fill_in(field, :with => value)
   end
 end
 
 # Fill in text field
-When /^(?:|I )fill in "([^"]*)" for "([^"]*)"$/ do |value, field|
+When /^(?:|I )fill in "([^"]*)" (?:with|for) '(.*)'$/ do |field, value|
   patiently do
     fill_in(field, :with => value)
   end
@@ -279,7 +281,7 @@ end
 # See [here](https://makandracards.com/makandra/1225-test-that-a-number-or-money-amount-is-shown-with-cucumber) for details
 Then /^I should( not)? see the (?:number|amount) ([\-\d,\.]+)(?: (.*?))?$/ do |negate, amount, unit|
   no_minus = amount.starts_with?('-') ? '' : '[^\\-]'
-  nbsp = 0xC2.chr + 0xA0.chr
+  nbsp = " "
   regexp = Regexp.new(no_minus + "\\b" + Regexp.quote(amount) + (unit ? "( |#{nbsp}| )(#{unit}|#{Regexp.quote(HTMLEntities.new.encode(unit, :named))})" :"\\b"))
   expectation = negate ? :should_not : :should
   patiently do
@@ -314,8 +316,15 @@ end
 # Checks for the presence of an option in a select
 Then /^"([^"]*)" should( not)? be an option for "([^"]*)"$/ do |value, negate, field|
   patiently do
-    expectation = negate ? :should_not : :should
-    field_labeled(field).find(:xpath, ".//option[text() = '#{value}']").send(expectation, be_present)
+    xpath = ".//option[text() = '#{value}']"
+    if negate
+      begin
+        field_labeled(field).find(:xpath, xpath).should_not be_present
+      rescue Capybara::ElementNotFound
+      end
+    else
+      field_labeled(field).find(:xpath, xpath).should be_present
+    end
   end
 end
 

data/lib/spreewald.rb

@@ -1,2 +1,4 @@
+# coding: UTF-8
+
 require "spreewald_support/version"
 require "spreewald_support/github"

data/lib/spreewald_support/github.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 module Spreewald
   def self.github_url
     "https://github.com/makandra/spreewald"

data/lib/spreewald_support/mail_finder.rb

@@ -1,17 +1,21 @@
+# coding: UTF-8
+
 class MailFinder
   class << self
 
     attr_accessor :user_identity
 
     def find(conditions)
+      filename_method = Rails::VERSION::MAJOR < 3 ? 'original_filename' : 'filename'
       ActionMailer::Base.deliveries.detect do |mail|
+        mail_body = email_text_body(mail)
         [ conditions[:to].nil? || mail.to.include?(resolve_email conditions[:to]),
           conditions[:cc].nil? || mail.cc.andand.include?(resolve_email conditions[:cc]),
           conditions[:bcc].nil? || mail.bcc.andand.include?(resolve_email conditions[:bcc]),
           conditions[:from].nil? || mail.from.include?(resolve_email conditions[:from]),
           conditions[:subject].nil? || mail.subject.include?(conditions[:subject]),
-          conditions[:body].nil? || mail.body.include?(conditions[:body]),
-          conditions[:attachments].nil? || conditions[:attachments].split(/\s*,\s*/).sort == Array(mail.attachments).collect(&:original_filename).sort
+          conditions[:body].nil? || mail_body.include?(conditions[:body]),
+          conditions[:attachments].nil? || conditions[:attachments].split(/\s*,\s*/).sort == Array(mail.attachments).collect(&:"#{filename_method}").sort
         ].all?
       end.tap do |mail|
         log(mail)
@@ -30,13 +34,23 @@ class MailFinder
       if mail.present?
         File.open("log/test_mails.log", "a") do |file|
           file << "From: #{mail.from}\n"
-          file << "To: #{mail.to.join(', ')}\n"
+          file << "To: #{mail.to.join(', ')}\n" if mail.to
           file << "Subject: #{mail.subject}\n\n"
-          file << mail.body
+          file << email_text_body(mail)
           file << "\n-------------------------\n\n"
         end
       end
     end
 
+    def email_text_body(mail)
+      if mail.parts.any?
+        mail.parts.select { |part| part.content_type.include?('text/') }.collect(&:decoded).join("\n")
+      elsif mail.body.respond_to? :raw_source
+        mail.body.raw_source
+      else
+        mail.body
+      end
+    end
+
   end
 end

data/lib/spreewald_support/path_selector_fallbacks.rb

@@ -1,6 +1,8 @@
+# coding: UTF-8
+
 module PathSelectorFallbacks
   def _selector_for(locator)
-    if respond_to?(:select_for)
+    if respond_to?(:selector_for)
       selector_for(locator)
     elsif locator =~ /^"(.+)"$/
       $1

data/lib/spreewald_support/step_fallback.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 module StepFallback
   def step(*args)
     if defined?(super)

data/lib/spreewald_support/tolerance_for_selenium_sync_issues.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 module ToleranceForSeleniumSyncIssues
   # This is similiar but not entirely the same as Capybara::Node::Base#wait_until or Capybara::Session#wait_until
   def patiently(seconds=Capybara.default_wait_time, &block)

data/lib/spreewald_support/version.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 module Spreewald
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spreewald
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Tobias Kraze
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-30 00:00:00 +01:00
-default_executable: 
+date: 2012-10-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: cucumber-rails
@@ -92,7 +91,6 @@ files:
 - lib/spreewald_support/version.rb
 - spreewald.gemspec
 - support/documentation_generator.rb
-has_rdoc: true
 homepage: https://github.com/makandra/spreewald
 licenses: []
 
@@ -122,9 +120,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.9.5
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Collection of useful cucumber steps.
 test_files: []
 
+has_rdoc: