aktion_test 0.3.0 → 0.3.1

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v0.3.1
+  * Remove simplecov dep from AktionTest module and load it manually for ourselves
+
 # v0.3.0
   * New spec helper interface, more OOPish this time
   * Modules receive the spec helper instance in their initialize to load dependencies

data/lib/aktion_test/matchers/base.rb

@@ -12,15 +12,11 @@ module AktionTest
       end
 
       def failure_message
-        raise "Called failure message before determining a match from #{caller[0]}" if @matches.nil?
-        raise "Called failure message while the match was positive from #{caller[0]}" if @matches
-        "Expected #{expectation}\n#{problems_for_should}\n"
+        message(false)
       end
 
       def negative_failure_message
-        raise "Called negative failure message before determining a match from #{caller[0]}" if @matches.nil?
-        raise "Called negative failure message while the match was unsucessful from #{caller[0]}" unless @matches
-        "Did not expect #{expectation}\n#{problems_for_should_not}\n"
+        message(true)
       end
 
     protected
@@ -40,6 +36,19 @@ module AktionTest
       def perform_match!
         raise "Override perform_match! with your custom matching logic. The subject is available through @subject"
       end
+
+    private
+      
+      def message(match)
+        check_match(match)
+        "#{match ? 'Did not expect' : 'Expected'} #{expectation}\n#{send(match ? :problems_for_should_not : :problems_for_should)}\n"
+      end
+
+      def check_match(match)
+        method = match ? 'negative failure message' : 'failure message'
+        raise "Called #{method} before determining a match from #{caller[0]} " if @matches.nil?
+        raise "Called #{method} while the match was #{match ? 'negative' : 'positive'} from #{caller[0]}" unless @matches == match
+      end
     end
   end
 end

data/lib/aktion_test/module/aktion_test.rb

@@ -3,7 +3,6 @@ module AktionTest
     class AktionTest < Base
       def initialize(spec, options={})
         super
-        spec.use :Simplecov
       end
 
       def prepare

data/lib/aktion_test/version.rb

@@ -1,3 +1,3 @@
 module AktionTest
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/spec/spec_helper.rb

@@ -2,9 +2,13 @@ $: << File.dirname(__FILE__)
 require 'aktion_test'
 require 'support/autoload'
 
+require 'simplecov'
+SimpleCov.start do
+  add_group 'Matchers', 'lib/aktion_test/matchers'
+  add_group 'Modules',  'lib/aktion_test/module'
+end
+
 AktionTest::SpecHelper.build do
   use :AktionTest, :FactoryGirl, :Faker, :RSpec, :Timecop
 end
 
-SimpleCov.add_group 'Matchers', 'lib/aktion_test/matchers'
-SimpleCov.add_group 'Modules',  'lib/aktion_test/module'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aktion_test
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -154,12 +154,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -615248081
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Gems, libs, helpers for test suites.