seatbelt 0.1.0 → 0.1.1

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - jruby-18mode # JRuby in 1.8 mode
+  - jruby-19mode # JRuby in 1.9 mode
+  - rbx-18mode
+  - rbx-19mode

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 0.1.1
+
+  * assert_mail subject now support regular explicitly (not implicitly anymore)
+
 ## 0.1.0
 
   * include assert_mail

data/README.md

@@ -1,4 +1,4 @@
-# Seatbelt
+# Seatbelt [![Build Status](https://secure.travis-ci.org/alto/seatbelt.png)](http://travis-ci.org/alto/seatbelt)
 
 Provide a number of custom assertions for Ruby and Ruby on Rails
 

data/lib/seatbelt/assert_mail.rb

@@ -24,7 +24,14 @@ module Seatbelt
     def got_mail?(mail, options={})
       return false if options[:to]      && !mail.to.include?(options[:to])
       return false if options[:from]    && !mail.from.include?(options[:from])
-      return false if options[:subject] && (mail.subject !~ /#{options[:subject]}/)
+
+      case options[:subject]
+      when String
+        return false if mail.subject != options[:subject]
+      when Regexp
+        return false if mail.subject !~ /#{options[:subject]}/
+      end
+
       return false if options[:cc]      && !mail.cc.include?(options[:cc])
       return false if options[:bcc]     && !mail.bcc.include?(options[:bcc])
       if options[:body]
@@ -40,8 +47,7 @@ module Seatbelt
 
   end
 end
-
-if Module.const_defined?(:ActionMailer)
+if Object.const_defined?(:ActionMailer)
   class Test::Unit::TestCase
     include Seatbelt::AssertMail
   end

data/lib/seatbelt/version.rb

@@ -1,3 +1,3 @@
 module Seatbelt
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/seatbelt.gemspec

@@ -4,9 +4,9 @@ require File.expand_path('../lib/seatbelt/version', __FILE__)
 Gem::Specification.new do |gem|
   gem.authors       = ["Thorsten Böttger"]
   gem.email         = ["boettger@mt7.de"]
-  gem.description   = %q{Provide custom assertions for Ruby and Ruby on Rails}
   gem.summary       = %q{Provide custom assertions for Ruby and Ruby on Rails}
-  gem.homepage      = "http://github.com/also/seatbelt"
+  gem.description   = %q{Goal is to provide custom, high quality and high level assertions for Ruby and Ruby on Rails}
+  gem.homepage      = "http://github.com/alto/seatbelt"
   gem.licenses      = ["MIT"]
 
   gem.files         = `git ls-files`.split($\)
@@ -17,6 +17,10 @@ Gem::Specification.new do |gem|
   gem.version       = Seatbelt::VERSION
 
   gem.add_dependency 'multi_json'
+  gem.add_development_dependency 'rake'
   gem.add_development_dependency 'activesupport'
   gem.add_development_dependency 'actionmailer'
+  gem.add_development_dependency 'travis-lint'
+  gem.add_development_dependency 'json'
+  # gem.add_development_dependency 'ruby-debug'
 end

data/test/assert_json_old_dsl_test.rb

@@ -9,7 +9,7 @@ class Seatbelt::AssertJsonTest < Test::Unit::TestCase
   #   end
   # end
   # def test_string_crosscheck
-  #   assert_raises(MiniTest::Assertion) do
+  #   assert_assertion_fails do
   #     assert_json '"key"' do |json|
   #       json.element 'wrong_key'
   #     end
@@ -33,14 +33,14 @@ class Seatbelt::AssertJsonTest < Test::Unit::TestCase
     end
   end
   def test_single_hash_crosscheck_for_key
-    assert_raises(MiniTest::Assertion) do
+    assert_assertion_fails do
       assert_json '{"key":"value"}' do |json|
         json.element 'wrong_key', 'value'
       end
     end
   end
   def test_single_hash_crosscheck_for_value
-    assert_raises(MiniTest::Assertion) do
+    assert_assertion_fails do
       assert_json '{"key":"value"}' do |json|
         json.element 'key', 'wrong_value'
       end
@@ -54,7 +54,7 @@ class Seatbelt::AssertJsonTest < Test::Unit::TestCase
     end
   end
   def test_not_element_crosscheck
-    assert_raises(MiniTest::Assertion) do
+    assert_assertion_fails do
       assert_json '{"key":"value"}' do |json|
         json.not_element 'key'
       end
@@ -76,21 +76,21 @@ class Seatbelt::AssertJsonTest < Test::Unit::TestCase
     end
   end
   def test_array_crosscheck_order
-    assert_raises(MiniTest::Assertion) do
+    assert_assertion_fails do
       assert_json '["value1","value2","value3"]' do |json|
         json.element 'value2'
       end
     end
   end
   def test_array_crosscheck_for_first_item
-    assert_raises(MiniTest::Assertion) do
+    assert_assertion_fails do
       assert_json '["value1","value2","value3"]' do |json|
         json.element 'wrong_value1'
       end
     end
   end
   def test_array_crosscheck_for_second_item
-    assert_raises(MiniTest::Assertion) do
+    assert_assertion_fails do
       assert_json '["value1","value2","value3"]' do |json|
         json.element 'value1'
         json.element 'wrong_value2'
@@ -104,12 +104,12 @@ class Seatbelt::AssertJsonTest < Test::Unit::TestCase
     end
   end
   def test_nested_arrays_crosscheck
-    assert_raises(MiniTest::Assertion) do
+    assert_assertion_fails do
       assert_json '[[["deep","another_depp"],["second_deep"]]]' do |json|
         json.element [["deep","wrong_another_depp"],["second_deep"]]
       end
     end
-    assert_raises(MiniTest::Assertion) do
+    assert_assertion_fails do
       assert_json '[[["deep","another_depp"],["second_deep"]]]' do |json|
         json.element [["deep","another_depp"],["wrong_second_deep"]]
       end
@@ -122,21 +122,21 @@ class Seatbelt::AssertJsonTest < Test::Unit::TestCase
     end
   end
   def test_hash_with_value_array_crosscheck_wrong_key
-    assert_raises(MiniTest::Assertion) do
+    assert_assertion_fails do
       assert_json '{"key":["value1","value2"]}' do |json|
         json.element 'wrong_key', ['value1', 'value2']
       end
     end
   end
   def test_hash_with_value_array_crosscheck_wrong_value1
-    assert_raises(MiniTest::Assertion) do
+    assert_assertion_fails do
       assert_json '{"key":["value1","value2"]}' do |json|
         json.element 'key', ['wrong_value1', 'value2']
       end
     end
   end
   def test_hash_with_value_array_crosscheck_wrong_value2
-    assert_raises(MiniTest::Assertion) do
+    assert_assertion_fails do
       assert_json '{"key":["value1","value2"]}' do |json|
         json.element 'key', ['value1', 'wrong_value2']
       end
@@ -152,7 +152,7 @@ class Seatbelt::AssertJsonTest < Test::Unit::TestCase
     end
   end
   def test_hash_with_array_of_hashes_crosscheck_inner_key
-    assert_raises(MiniTest::Assertion) do
+    assert_assertion_fails do
       assert_json '{"key":[{"inner_key1":"value1"},{"inner_key2":"value2"}]}' do |json|
         json.element 'key' do
           json.element 'wrong_inner_key1', 'value1'
@@ -161,7 +161,7 @@ class Seatbelt::AssertJsonTest < Test::Unit::TestCase
     end
   end
   def test_hash_with_array_of_hashes_crosscheck_inner_value
-    assert_raises(MiniTest::Assertion) do
+    assert_assertion_fails do
       assert_json '{"key":[{"inner_key1":"value1"},{"inner_key2":"value2"}]}' do |json|
         json.element 'key' do
           json.element 'inner_key1', 'wrong_value1'
@@ -184,13 +184,13 @@ class Seatbelt::AssertJsonTest < Test::Unit::TestCase
     end
   end
   def test_array_with_two_hashes_crosscheck
-    assert_raises(MiniTest::Assertion) do
+    assert_assertion_fails do
       assert_json '[{"key1":"value1"}, {"key2":"value2"}]' do |json|
         json.element 'wrong_key1', 'value1'
         json.element 'key2', 'value2'
       end
     end
-    assert_raises(MiniTest::Assertion) do
+    assert_assertion_fails do
       assert_json '[{"key1":"value1"}, {"key2":"value2"}]' do |json|
         json.element 'key1', 'value1'
         json.element 'key2', 'wrong_value2'
@@ -208,12 +208,12 @@ class Seatbelt::AssertJsonTest < Test::Unit::TestCase
     end
   end
   def test_nested_hashes_crosscheck
-    assert_raises(MiniTest::Assertion) do
+    assert_assertion_fails do
       assert_json '{"outer_key":{"key":{"inner_key":"value"}}}' do |json|
         json.element 'wrong_outer_key'
       end
     end
-    assert_raises(MiniTest::Assertion) do
+    assert_assertion_fails do
       assert_json '{"outer_key":{"key":{"inner_key":"value"}}}' do |json|
         json.element 'outer_key' do
           json.element 'key' do
@@ -245,7 +245,7 @@ class Seatbelt::AssertJsonTest < Test::Unit::TestCase
   end
 
   def test_not_enough_elements_in_array
-    assert_raises(MiniTest::Assertion) do
+    assert_assertion_fails do
       assert_json '["one","two"]' do |json|
         json.element "one"
         json.element "two"
@@ -255,7 +255,7 @@ class Seatbelt::AssertJsonTest < Test::Unit::TestCase
   end
 
   def test_not_enough_elements_in_hash_array
-    assert_raises(MiniTest::Assertion) do
+    assert_assertion_fails do
       assert_json '{"key":[{"key1":"value1"}, {"key2":"value2"}]}' do |json|
         json.element 'key' do
           json.element 'key1', 'value1'

data/test/assert_json_test.rb

@@ -9,7 +9,7 @@ class Seatbelt::AssertJsonNewDslTest < Test::Unit::TestCase
   #   end
   # end
   # def test_string_crosscheck
-  #   assert_raises(MiniTest::Assertion) do
+  #   assert_assertion_fails do
   #     assert_json '"key"' do
   #       has 'wrong_key'
   #     end
@@ -38,14 +38,14 @@ class Seatbelt::AssertJsonNewDslTest < Test::Unit::TestCase
     end
   end
   def test_single_hash_crosscheck_for_key
-    assert_raises(MiniTest::Assertion) do
+    assert_assertion_fails do
       assert_json '{"key":"value"}' do
         has 'wrong_key', 'value'
       end
     end
   end
   def test_single_hash_crosscheck_for_value
-    assert_raises(MiniTest::Assertion) do
+    assert_assertion_fails do
       assert_json '{"key":"value"}' do
         has 'key', 'wrong_value'
       end
@@ -59,7 +59,7 @@ class Seatbelt::AssertJsonNewDslTest < Test::Unit::TestCase
     end
   end
   def test_has_not_crosscheck
-    assert_raises(MiniTest::Assertion) do
+    assert_assertion_fails do
       assert_json '{"key":"value"}' do
         has_not 'key'
       end
@@ -81,21 +81,21 @@ class Seatbelt::AssertJsonNewDslTest < Test::Unit::TestCase
     end
   end
   def test_array_crosscheck_order
-    assert_raises(MiniTest::Assertion) do
+    assert_assertion_fails do
       assert_json '["value1","value2","value3"]' do
         has 'value2'
       end
     end
   end
   def test_array_crosscheck_for_first_item
-    assert_raises(MiniTest::Assertion) do
+    assert_assertion_fails do
       assert_json '["value1","value2","value3"]' do
         has 'wrong_value1'
       end
     end
   end
   def test_array_crosscheck_for_second_item
-    assert_raises(MiniTest::Assertion) do
+    assert_assertion_fails do
       assert_json '["value1","value2","value3"]' do
         has 'value1'
         has 'wrong_value2'
@@ -109,12 +109,12 @@ class Seatbelt::AssertJsonNewDslTest < Test::Unit::TestCase
     end
   end
   def test_nested_arrays_crosscheck
-    assert_raises(MiniTest::Assertion) do
+    assert_assertion_fails do
       assert_json '[[["deep","another_depp"],["second_deep"]]]' do
         has [["deep","wrong_another_depp"],["second_deep"]]
       end
     end
-    assert_raises(MiniTest::Assertion) do
+    assert_assertion_fails do
       assert_json '[[["deep","another_depp"],["second_deep"]]]' do
         has [["deep","another_depp"],["wrong_second_deep"]]
       end
@@ -127,21 +127,21 @@ class Seatbelt::AssertJsonNewDslTest < Test::Unit::TestCase
     end
   end
   def test_hash_with_value_array_crosscheck_wrong_key
-    assert_raises(MiniTest::Assertion) do
+    assert_assertion_fails do
       assert_json '{"key":["value1","value2"]}' do
         has 'wrong_key', ['value1', 'value2']
       end
     end
   end
   def test_hash_with_value_array_crosscheck_wrong_value1
-    assert_raises(MiniTest::Assertion) do
+    assert_assertion_fails do
       assert_json '{"key":["value1","value2"]}' do
         has 'key', ['wrong_value1', 'value2']
       end
     end
   end
   def test_hash_with_value_array_crosscheck_wrong_value2
-    assert_raises(MiniTest::Assertion) do
+    assert_assertion_fails do
       assert_json '{"key":["value1","value2"]}' do
         has 'key', ['value1', 'wrong_value2']
       end
@@ -157,7 +157,7 @@ class Seatbelt::AssertJsonNewDslTest < Test::Unit::TestCase
     end
   end
   def test_hash_with_array_of_hashes_crosscheck_inner_key
-    assert_raises(MiniTest::Assertion) do
+    assert_assertion_fails do
       assert_json '{"key":[{"inner_key1":"value1"},{"inner_key2":"value2"}]}' do
         has 'key' do
           has 'wrong_inner_key1', 'value1'
@@ -166,7 +166,7 @@ class Seatbelt::AssertJsonNewDslTest < Test::Unit::TestCase
     end
   end
   def test_hash_with_array_of_hashes_crosscheck_inner_value
-    assert_raises(MiniTest::Assertion) do
+    assert_assertion_fails do
       assert_json '{"key":[{"inner_key1":"value1"},{"inner_key2":"value2"}]}' do
         has 'key' do
           has 'inner_key1', 'wrong_value1'
@@ -189,13 +189,13 @@ class Seatbelt::AssertJsonNewDslTest < Test::Unit::TestCase
     end
   end
   def test_array_with_two_hashes_crosscheck
-    assert_raises(MiniTest::Assertion) do
+    assert_assertion_fails do
       assert_json '[{"key1":"value1"}, {"key2":"value2"}]' do
         has 'wrong_key1', 'value1'
         has 'key2', 'value2'
       end
     end
-    assert_raises(MiniTest::Assertion) do
+    assert_assertion_fails do
       assert_json '[{"key1":"value1"}, {"key2":"value2"}]' do
         has 'key1', 'value1'
         has 'key2', 'wrong_value2'
@@ -213,12 +213,12 @@ class Seatbelt::AssertJsonNewDslTest < Test::Unit::TestCase
     end
   end
   def test_nested_hashes_crosscheck
-    assert_raises(MiniTest::Assertion) do
+    assert_assertion_fails do
       assert_json '{"outer_key":{"key":{"inner_key":"value"}}}' do
         has 'wrong_outer_key'
       end
     end
-    assert_raises(MiniTest::Assertion) do
+    assert_assertion_fails do
       assert_json '{"outer_key":{"key":{"inner_key":"value"}}}' do
         has 'outer_key' do
           has 'key' do
@@ -250,7 +250,7 @@ class Seatbelt::AssertJsonNewDslTest < Test::Unit::TestCase
   end
 
   def test_not_enough_hass_in_array
-    assert_raises(MiniTest::Assertion) do
+    assert_assertion_fails do
       assert_json '["one","two"]' do
         has "one"
         has "two"
@@ -260,7 +260,7 @@ class Seatbelt::AssertJsonNewDslTest < Test::Unit::TestCase
   end
 
   def test_not_enough_hass_in_hash_array
-    assert_raises(MiniTest::Assertion) do
+    assert_assertion_fails do
       assert_json '{"key":[{"key1":"value1"}, {"key2":"value2"}]}' do
         has 'key' do
           has 'key1', 'value1'

data/test/assert_mail_test.rb

@@ -10,23 +10,23 @@ class Seatbelt::AssertMailTest < Test::Unit::TestCase
     assert_mail :bcc => 'bcc@seatbelt.co.nz'
     assert_mail :from => 'from@seatbelt.co.nz'
     assert_mail :subject => 'mail subject'
-    assert_mail :subject => 'subject' # uses regular expressions
+    assert_mail :subject => /subject/
     assert_mail :body => 'mail body text'
-    assert_mail :body => 'body text' # uses regular expressions
+    assert_mail :body => /body text/
     assert_mail :body => ['mail body', 'body text']
 
-    assert_mail :to => 'test@seatbelt.co.nz', :subject => 'subject', :body => 'body'
+    assert_mail :to => 'test@seatbelt.co.nz', :subject => /subject/, :body => 'body'
   end
   def test_assert_mail_crosscheck
     Mailer.test.deliver
 
-    assert_raises(MiniTest::Assertion) { assert_mail :to => 'unknown@seatbelt.co.nz' }
-    assert_raises(MiniTest::Assertion) { assert_mail :cc => 'unknown@seatbelt.co.nz' }
-    assert_raises(MiniTest::Assertion) { assert_mail :bcc => 'unknown@seatbelt.co.nz' }
-    assert_raises(MiniTest::Assertion) { assert_mail :from => 'unknown@seatbelt.co.nz' }
-    assert_raises(MiniTest::Assertion) { assert_mail :subject => 'unknown' }
-    assert_raises(MiniTest::Assertion) { assert_mail :body => 'unknown' }
-    assert_raises(MiniTest::Assertion) { assert_mail :to => 'unknown@seatbelt.co.nz', :subject => 'unknown', :body => 'unknown' }
+    assert_assertion_fails { assert_mail :to => 'unknown@seatbelt.co.nz' }
+    assert_assertion_fails { assert_mail :cc => 'unknown@seatbelt.co.nz' }
+    assert_assertion_fails { assert_mail :bcc => 'unknown@seatbelt.co.nz' }
+    assert_assertion_fails { assert_mail :from => 'unknown@seatbelt.co.nz' }
+    assert_assertion_fails { assert_mail :subject => 'unknown' }
+    assert_assertion_fails { assert_mail :body => 'unknown' }
+    assert_assertion_fails { assert_mail :to => 'unknown@seatbelt.co.nz', :subject => 'unknown', :body => 'unknown' }
   end
 
   def test_assert_mail_with_multiple_mails
@@ -38,12 +38,12 @@ class Seatbelt::AssertMailTest < Test::Unit::TestCase
   end
 
   def test_assert_mail_with_block
-    assert_mail :to => 'test@seatbelt.co.nz', :subject => 'subject', :body => 'body' do
+    assert_mail :to => 'test@seatbelt.co.nz', :subject => /subject/, :body => 'body' do
       Mailer.test.deliver
     end
   end
   def test_assert_mail_with_block_crosscheck
-    assert_raises(MiniTest::Assertion) do
+    assert_assertion_fails do
       assert_mail :to => 'unknown@seatbelt.co.nz' do
         Mailer.test.deliver
       end
@@ -68,7 +68,7 @@ class Seatbelt::AssertMailTest < Test::Unit::TestCase
   end
 
   def test_assert_no_mail_crosscheck
-    assert_raises(MiniTest::Assertion) do
+    assert_assertion_fails do
       assert_no_mail :to => 'test@seatbelt.co.nz' do
         Mailer.test.deliver
       end

data/test/test_helper.rb

@@ -2,9 +2,20 @@ require 'rubygems'
 require 'test/unit'
 require 'active_support'
 require 'action_mailer'
+require 'json'
 
 $:.push File.expand_path("../../lib", __FILE__)
 require File.dirname(__FILE__) + '/../lib/seatbelt.rb'
 
 # Requiring custom spec helpers
 Dir[File.dirname(__FILE__) + "/helpers/**/*.rb"].sort.each { |f| require File.expand_path(f) }
+
+class Test::Unit::TestCase
+  def assert_assertion_fails(&block)
+    if Object.const_defined?(:MiniTest)
+      assert_raises(MiniTest::Assertion, &block)
+    else
+      assert_raises(Test::Unit::AssertionFailedError, &block)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: seatbelt
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-21 00:00:00.000000000 Z
+date: 2012-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70161394805840 !ruby/object:Gem::Requirement
+  requirement: &70193217097980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70161394805840
+  version_requirements: *70193217097980
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70193217096920 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70193217096920
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70161394805420 !ruby/object:Gem::Requirement
+  requirement: &70193217096460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +43,32 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70161394805420
+  version_requirements: *70193217096460
 - !ruby/object:Gem::Dependency
   name: actionmailer
-  requirement: &70161394805000 !ruby/object:Gem::Requirement
+  requirement: &70193217096000 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70193217096000
+- !ruby/object:Gem::Dependency
+  name: travis-lint
+  requirement: &70193217095560 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70193217095560
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &70193217095120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,8 +76,9 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70161394805000
-description: Provide custom assertions for Ruby and Ruby on Rails
+  version_requirements: *70193217095120
+description: Goal is to provide custom, high quality and high level assertions for
+  Ruby and Ruby on Rails
 email:
 - boettger@mt7.de
 executables: []
@@ -52,6 +86,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -67,7 +102,7 @@ files:
 - test/assert_mail_test.rb
 - test/helpers/mailer.rb
 - test/test_helper.rb
-homepage: http://github.com/also/seatbelt
+homepage: http://github.com/alto/seatbelt
 licenses:
 - MIT
 post_install_message: 
@@ -88,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Provide custom assertions for Ruby and Ruby on Rails