Tests fixed

Gemfile

@@ -19,8 +19,8 @@ gem 'oauth2', '~> 0.8.0'
 gem 'carrierwave'
 gem 'carrierwave-imageoptimizer'
 gem 'mini_magick'
-# gem 'carmen', :path => '../carmen/' if File.directory?('../carmen/') && RbConfig::CONFIG['target_os'] =~ /mswin|mingw|cygwin/i
-#gem 'carmen-rails'
+gem 'carmen', :path => '../carmen/' if File.directory?('../carmen/') && RbConfig::CONFIG['target_os'] =~ /mswin|mingw|cygwin/i
+gem 'carmen-rails'
 gem 'nested_form'
 gem 'acts_as_list'
 gem 'geocoder'

Gemfile.lock

@@ -60,6 +60,11 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
+    carmen (1.0.1)
+      unicode_utils (~> 1.4.0)
+    carmen-rails (1.0.1)
+      carmen (~> 1.0.0)
+      rails
     carrierwave (0.10.0)
       activemodel (>= 3.2.0)
       activesupport (>= 3.2.0)
@@ -278,6 +283,7 @@ GEM
     uglifier (2.5.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
+    unicode_utils (1.4.0)
     wdm (0.1.0)
     webmock (1.18.0)
       addressable (>= 2.3.6)
@@ -296,6 +302,7 @@ DEPENDENCIES
   better_errors
   binding_of_caller
   capybara
+  carmen-rails
   carrierwave
   carrierwave-imageoptimizer
   coffee-rails (~> 4.0.0)

app/helpers/bike_bike_form_helper.rb

@@ -381,7 +381,9 @@ module BikeBikeFormHelper
 
 		private
 			def custom_field(method, value, options, type)
-				options[:_controller] = params[:controller]
+				if defined? params
+					options[:_controller] = params[:controller]
+				end
 				options[:_record] = object
 				options = BikeBikeFormHelper.get_options(method, options, type)
 				html = BikeBikeFormHelper.send(type + '_tag', method, value, options, self)

config/initializers/drupal_hash.rb

@@ -109,7 +109,6 @@ module Sorcery
 						end
 
 					end
-					puts "\nHASH:\t#{output}\n"
 					return output
 				end
 			end

spec/features/pages/login_spec.rb

@@ -31,7 +31,7 @@ describe 'Login' do
 		visit login_path
 		form = find 'form[action$="/user_sessions"]'
 		expect(form).to have_button 'Sign In'
-		expect(form).to have_field 'email_'
+		expect(form).to have_field 'email'
 		expect(form).to have_field 'password'
 		expect(form).to have_link 'facebook'
 	end
@@ -62,7 +62,7 @@ describe 'Login' do
 		it "allows you to login" do
 			visit login_path
 			form = find 'form[action$="/user_sessions"]'
-			form.find("#email_").set(user.email)
+			form.find("#email").set(user.email)
 			form.find("#password").set('secret')
 			click_button "Sign_In"
 		end

spec/features/pages/organization_registration_spec.rb

@@ -7,7 +7,7 @@ describe 'Organization Registration' do
 	before(:each) do
 		visit login_path
 		form = find 'form[action$="/user_sessions"]'
-		form.find("#email_").set(user.email)
+		form.find("#email").set(user.email)
 		form.find("#password").set('secret')
 		click_button "Sign_In"
 		visit new_organization_path