Permalink
Browse files

Fix spree auth changes.

  • Loading branch information...
1 parent f28512d commit 059c2d502396b6f3a5f9e7cf8390d2f5f3b08c64 @JDutil JDutil committed May 7, 2013
Showing with 8 additions and 8 deletions.
  1. +2 −2 Gemfile
  2. +1 −1 Rakefile
  3. +1 −1 app/controllers/spree/email_sender_controller.rb
  4. +3 −3 spec/spec_helper.rb
  5. +1 −1 spree_email_to_friend.gemspec
View
@@ -1,3 +1,3 @@
-source :rubygems
+source 'https://rubygems.org'
+gem 'spree', github: 'spree/spree'
gemspec
-
View
@@ -3,7 +3,7 @@ require 'rake/testtask'
require 'rake/packagetask'
require 'rubygems/package_task'
require 'rspec/core/rake_task'
-require 'spree/core/testing_support/common_rake'
+require 'spree/testing_support/common_rake'
RSpec::Core::RakeTask.new
@@ -6,7 +6,7 @@ class Spree::EmailSenderController < Spree::BaseController
def send_mail
if request.get?
- @mail_to_friend = Spree::MailToFriend.new(:sender_email => current_user.try(:email))
+ @mail_to_friend = Spree::MailToFriend.new(:sender_email => spree_current_user.try(:email))
else
mail_to_friend
end
View
@@ -4,12 +4,12 @@
require File.expand_path("../dummy/config/environment", __FILE__)
require 'rspec/rails'
-require 'spree/core/testing_support/factories'
-require 'spree/core/url_helpers'
+require 'spree/testing_support/factories'
+require 'spree/testing_support/url_helpers'
RSpec.configure do |config|
config.mock_with :rspec
config.fixture_path = "#{::Rails.root}/spec/fixtures"
config.use_transactional_fixtures = false
- config.include Spree::Core::UrlHelpers
+ config.include Spree::TestingSupport::UrlHelpers
end
@@ -20,5 +20,5 @@ Gem::Specification.new do |s|
s.add_development_dependency 'rspec-rails'
s.add_development_dependency 'sqlite3'
- s.add_development_dependency 'factory_girl', '~> 2.6'
+ s.add_development_dependency 'factory_girl', '~> 4.2'
end

0 comments on commit 059c2d5

Please sign in to comment.