cucumber-mailcatcher 0.8 → 0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2b61bc92a239d119071b3bc29c7cd2a8f8d9c82
-  data.tar.gz: 0fb4aa0bc30d90e88c79485a76199bd525068c99
+  metadata.gz: 2f302cf4686dd159d158da718fc421d3eb7ee05a
+  data.tar.gz: 5923b1530c63fe0c9264e154415628f91a49a2aa
 SHA512:
-  metadata.gz: b6499715c327435a3f054779c8c25ac75bcd1ec77b95d9e3a5b763409136cd95717c019cf51f41be6ec51d7a926378baa67a325bbe969ea2d9390cf71b0a4fad
-  data.tar.gz: 5dd2f706248129ab5e3c68ac825908a621745b14e7167c1d5ffd3bc96128184de79d2ad22e89c6d9d6d80e1cd73e2f63ab60bc55880b0809b1495c23e836b760
+  metadata.gz: 115b99aef3eea27156021cbaf9a2e60534b76622a03fc98d3224e8851e21d7b090dd6ffc0c98e801732440b5375c4d236196b16300724d2b53ef4ea0e44e0417
+  data.tar.gz: a90851ab6c87eb8262d9642b714fad95c75f7bdf0a7c13e7de580a071de14eb41f9b042b19f7da161c6751f7752ef4fdf9b22636ed872d1d5612e4fc80cb7a01

data/lib/cucumber/mailcatcher/http_client.rb

@@ -7,6 +7,8 @@ module Cucumber
   module Mailcatcher
 
     class HttpClient
+      @@server_url = nil
+
       def self.server_url
         @@server_url
       end
@@ -17,9 +19,8 @@ module Cucumber
 
       def initialize
         error = "Please set the Mailcatcher server url e.g. Cucumber::Mailcatcher::Api.server_url = 'http://localhost:1080'"
-        begin
-          valid = @@server_url =~ /\A#{URI.regexp(%w(http https))}\z/
-        end
+
+        valid = @@server_url =~ /\A#{URI.regexp(%w(http https))}\z/
 
         raise error unless valid
       end

data/lib/cucumber/mailcatcher/version.rb

@@ -2,6 +2,6 @@ module Cucumber
   module Mailcatcher
     NAME = "cucumber-mailcatcher"
     FOLDER = "cucumber/mailcatcher"
-    VERSION = "0.8"
+    VERSION = "0.9"
   end
 end

data/lib/cucumber/mailcatcher.rb

@@ -8,31 +8,31 @@ require 'cucumber/mailcatcher/http_client.rb'
 require 'cucumber/mailcatcher/version.rb'
 
 Then /^I should receive (\d+) email from "(.*?)"$/ do |count, address|
-  http = Cucumber::Mailcatcher::HttpClient.new
-  messages = http.get_messages_from_email address
+  api = Cucumber::Mailcatcher::Api.new Cucumber::Mailcatcher::HttpClient.new
+  messages = api.get_messages_from_email address
   expect(messages.length).to be count.to_i
 end
 
 Then /^I should receive (\d+) email sent to "(.*?)"$/ do |count, address|
-  http = Cucumber::Mailcatcher::HttpClient.new
-  messages = http.get_messages_to_email address
+  api = Cucumber::Mailcatcher::Api.new Cucumber::Mailcatcher::HttpClient.new
+  messages = api.get_messages_to_email address
   expect(messages.length).to be count.to_i
 end
 
 Then /^I should receive (\d+) email with subject "(.*?)"$/ do |count, subject|
-  http = Cucumber::Mailcatcher::HttpClient.new
-  messages = http.get_messages_with_subject subject
+  api = Cucumber::Mailcatcher::Api.new Cucumber::Mailcatcher::HttpClient.new
+  messages = api.get_messages_with_subject subject
   expect(messages.length).to be count.to_i
 end
 
 Then /^I should receive (\d+) email with a html body containing "(.*?)"$/ do |count, body|
-  http = Cucumber::Mailcatcher::HttpClient.new
-  messages = http.get_messages_with_html_body body
+  api = Cucumber::Mailcatcher::Api.new Cucumber::Mailcatcher::HttpClient.new
+  messages = api.get_messages_with_html_body body
   expect(messages.length).to be count.to_i
 end
 
 Then /^I should receive (\d+) email with a plain body containing "(.*?)"$/ do |count, body|
-  http = Cucumber::Mailcatcher::HttpClient.new
-  messages = http.get_messages_with_plain_body body
+  api = Cucumber::Mailcatcher::Api.new Cucumber::Mailcatcher::HttpClient.new
+  messages = api.get_messages_with_plain_body body
   expect(messages.length).to be count.to_i
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-mailcatcher
 version: !ruby/object:Gem::Version
-  version: '0.8'
+  version: '0.9'
 platform: ruby
 authors:
 - Nic Jackson