funktional 2.0.2 → 3.0.0

data/funktional.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{funktional}
-  s.version = "2.0.2"
+  s.version = "3.0.0"
   
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brent Greeff and Felix Clack"]

data/lib/funktional/model_assertions.rb

@@ -88,7 +88,8 @@ module Funktional
     end
     
     def assert_message(field, expected_error_message)
-      Funktional.test_instance.assert_equal(expected_error_message, self.errors[field])
+      error = self.errors[field].first
+      Funktional.test_instance.assert_equal(expected_error_message, error)
     end
     
     def must_be_valid_before_test!

data/lib/funktional/test_instance_methods.rb

@@ -58,7 +58,7 @@ module Funktional
     
     def should_render_404(expected_template = 'public/404')
       _wrap_assertion do
-        actual_template = @response.rendered[:template].to_s
+        actual_template = get_actual_template
         
         if actual_template.blank?
           msg = "redirected to [#{@response.redirected_to}]"
@@ -88,10 +88,10 @@ module Funktional
     
     def should_redirect_to(uri)
       _wrap_assertion do
-        actual_template = @response.rendered[:template].to_s
+        actual_template = get_actual_template
         
         if actual_template.blank?
-          msg = "redirected to [#{@response.redirected_to}]"
+          msg = "redirected to [#{@response.redirect_url}]"
         else
           msg = "rendered template [#{actual_template}]"
         end
@@ -101,6 +101,12 @@ module Funktional
       end
     end
     
+    def get_actual_template
+      all = @templates.keys
+      all -= (all.grep /\/_/)
+      all.reject {|e| e =~ /layout/}.first
+    end
+    
     def should_respond(expected_response)
       assert_response :not_found
       assert_template 'public/404'

data/lib/funktional.rb

@@ -1,47 +1,5 @@
 Rails.backtrace_cleaner.add_silencer { |line| line =~ /funktional/ }
 
-require 'test_help'
-
-require 'funktional/test_instance_methods'
-require 'funktional/test_class_methods'
-
-require 'funktional/assertion'
-require 'funktional/recursive_assertion'
-require 'funktional/assigned_assertion'
-require 'funktional/email_assertion'
-require 'funktional/flashed_assertion'
-require 'funktional/model_assertions'
-require 'funktional/route_checker'
-require 'funktional/attribute_test_helper'
-
-require 'funktional/context'
-require 'funktional/context/stack_recorder'
-require 'funktional/context/should_block'
-require 'funktional/context/should_not_block'
-require 'funktional/context/delegating_should_block'
-require 'funktional/context/should_create_block'
-require 'funktional/context/should_not_create_block'
-require 'funktional/context/should_not_delete_block'
-require 'funktional/context/should_not_send_email_block'
-require 'funktional/context/should_delete_block'
-require 'funktional/context/element_should_block'
-require 'funktional/context/count_should_block'
-require 'funktional/context/flashed_should_block'
-require 'funktional/context/assigned_should_block'
-require 'funktional/context/collector'
-
-require 'funktional/setup'
-
-ActiveRecord::Base.send(:include, Funktional::ModelAssertions)
-
-ActiveSupport::TestCase.send(:include, Funktional::TestInstanceMethods)
-ActiveSupport::TestCase.send :extend, Funktional::TestClassMethods
-ActiveSupport::TestCase.send(:include, Funktional::AttributeTestHelper)
-
-ActiveSupport::TestCase.send(:include, Funktional::Setup)
-
-if RAILS_ENV.eql? 'test' or $0 == 'irb'
-  require 'funktional/random_characters'
-  Integer.send :include, Funktional::RandomCharacters
+if Rails.env.eql? 'test' or $0 == 'irb'
+  require 'funktional/load'
 end
-

data/test/test_helper.rb

@@ -9,7 +9,7 @@ require "#{test_app}/config/environment.rb"
 
 # Load the testing framework
 require 'test_help'
-silence_warnings { RAILS_ENV = ENV['RAILS_ENV'] }
+silence_warnings { Rails.env = ENV['RAILS_ENV'] }
 
 # Run the migrations
 ActiveRecord::Migration.verbose = false

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: funktional
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 7
   prerelease: false
   segments: 
-  - 2
+  - 3
   - 0
-  - 2
-  version: 2.0.2
+  - 0
+  version: 3.0.0
 platform: ruby
 authors: 
 - Brent Greeff and Felix Clack