Skip to content
This repository has been archived by the owner on Nov 20, 2020. It is now read-only.

Commit

Permalink
Fix spree auth changes.
Browse files Browse the repository at this point in the history
  • Loading branch information
Jeff Dutil committed May 7, 2013
1 parent f28512d commit 059c2d5
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source :rubygems
source 'https://rubygems.org'
gem 'spree', github: 'spree/spree'
gemspec

2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion app/controllers/spree/email_sender_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion spree_email_to_friend.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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.