now support spree 2.0.X

Rakefile

@@ -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
 

app/assets/javascripts/admin/spree_multi_lingual.js

@@ -1,4 +1,4 @@
-//= require admin/spree_core
+//= require admin/spree_backend
 //= require admin/spree_multi_lingual_class
 
 var handle_rename = function(e, data) {

app/assets/javascripts/store/spree_multi_lingual.js

@@ -1 +1 @@
-//= require store/spree_core
+//= require store/spree_frontend

app/assets/stylesheets/admin/spree_multi_lingual.css.erb

@@ -1,9 +1,8 @@
 /*
- *= require admin/spree_core
+ *= require admin/spree_backend
 */
 
 
-
 input.sml-localized-field[type='text'] {
  background-position: 100% 50%;
  background-repeat: no-repeat;

app/assets/stylesheets/store/spree_multi_lingual.css

@@ -1,3 +0,0 @@
-/*
- *= require store/spree_core
-*/

app/controllers/controller_helpers_decorator.rb → app/controllers/store_controller_decorator.rb

@@ -1,4 +1,4 @@
-Spree::Core::ControllerHelpers::Common.module_eval do
+Spree::StoreController.class_eval do
   private
 
   # Internal : Set user I18n.locale

app/mailers/spree/order_mailer_decorator.rb

@@ -1,20 +1,17 @@
 Spree::OrderMailer.class_eval do
   # There might be a cleaner way to set locale instead of rewriting each method
-  def confirm_email(order, resend=false)
-    @order = find_order(order)
+  def confirm_email(order, resend = false)
+    @order = order.respond_to?(:id) ? order : Spree::Order.find(order)
     I18n.locale = @order.locale
-    subject = (resend ? "[#{t(:resend).upcase}] " : "")
-    subject += "#{Spree::Config[:site_name]} #{t('order_mailer.confirm_email.subject')} ##{@order.number}"
-    mail(:to => @order.email,
-    :subject => subject)
+    subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
+    subject += "#{Spree::Config[:site_name]} #{Spree.t('order_mailer.confirm_email.subject')} ##{@order.number}"
+    mail(to: @order.email, from: from_address, subject: subject)
   end
 
-  def cancel_email(order, resend=false)
-    @order = find_order(order)
-    I18n.locale = @order.locale
-    subject = (resend ? "[#{t(:resend).upcase}] " : "")
-    subject += "#{Spree::Config[:site_name]} #{t('order_mailer.cancel_email.subject')} ##{@order.number}"
-    mail(:to => @order.email,
-    :subject => subject)
+  def cancel_email(order, resend = false)
+    @order = order.respond_to?(:id) ? order : Spree::Order.find(order)
+    subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
+    subject += "#{Spree::Config[:site_name]} #{Spree.t('order_mailer.cancel_email.subject')} ##{@order.number}"
+    mail(to: @order.email, from: from_address, subject: subject)
   end
 end

lib/spree_multi_lingual.rb

@@ -1,5 +1,7 @@
 require 'spree_core'
-require 'spree_promo'
+require 'spree_backend'
+require 'spree_frontend'
+require 'spree_api'
 require 'spree_multi_lingual/engine'
 require "globalize3"
 require "easy_globalize3_accessors"

spec/requests/de/admin/products_spec.rb → spec/features/de/admin/products_spec.rb

@@ -1,5 +1,6 @@
 require 'spec_helper'
-describe "admin products" do
+
+feature "admin products" do
   stub_authorization!
 
   let!(:product) { FactoryGirl.create(:product) }

spec/requests/taxons_spec.rb → spec/features/taxons_spec.rb

@@ -22,7 +22,7 @@
 
     click_icon :edit
     click_link "fr"
-    page.should have_content("BONJOUR")
+    find("input#taxonomy_name_fr")[:value].should == "Bonjour"
 
     within("h1") { click_link "es" }
 
@@ -31,7 +31,7 @@
 
     click_icon :edit
     within("h1") { click_link "es" }
-    page.should have_content("HOLA")
+    find("input#taxonomy_name_es")[:value].should == "Hola"
   end
 
   context "edit taxons" do
@@ -68,8 +68,8 @@
 
         suffix = "#{locale.to_sym == I18n.locale ? "" : "_#{locale}"}"
 
-        first("input#taxon_name#{suffix}")[:value].should == "TAXON - #{locale.upcase}"
-        first("textarea#taxon_description#{suffix}")[:value].should == "TAXON Description - #{locale * 20}"
+        find("input#taxon_name#{suffix}")[:value].should == "TAXON - #{locale.upcase}"
+        find("textarea#taxon_description#{suffix}")[:value].should == "TAXON Description - #{locale * 20}"
       end
 
       # set local and ensure each page is visitable

spec/lib/search/base_spec.rb

@@ -1,11 +1,13 @@
 require 'spec_helper'
 
 describe Spree::Core::Search::Base do
+  let(:stock_location) { create(:stock_location) }
 
   before do
-    include ::Spree::ProductFilters
-    @product1 = create(:product, :name => "RoR Shirt", :name_fr => "RoR Chemise", :name_es => "RoR Camisa", :price => 9.00, :on_hand => 1, :available_on => 2.days.ago)
-    @product2 = create(:product, :name => "Trouser", :name_fr => "Pantalon", :name_es => "Pantalones", :price => 9.00, :on_hand => 1)
+    include ::Spree::Core::ProductFilters
+    @product1 = create(:product, :name => "RoR Shirt", :name_fr => "RoR Chemise", :name_es => "RoR Camisa", :price => 9.00, :available_on => 2.days.ago)
+    @product2 = create(:product, :name => "Trouser", :name_fr => "Pantalon", :name_es => "Pantalones", :price => 9.00 )
+    stock_location.stock_items.update_all(count_on_hand: 1)
   end
 
   it "returns all products by default" do
@@ -47,7 +49,7 @@
   end
 
   it 'should return product without translation' do
-    create(:product, :name => "RoR Shirt", :price => 9.00, :on_hand => 1)
+    create(:product, :name => "RoR Shirt", :price => 9.00)
     params = { :per_page => "" }
     I18n.locale = :fr
     searcher = Spree::Core::Search::Base.new(params)

spec/mailers/order_mailer_spec.rb

@@ -6,7 +6,7 @@ module Spree
     include EmailSpec::Helpers
     include EmailSpec::Matchers
 
-    let(:order) { FactoryGirl.create(:order, :locale => :fr) }
+    let(:order) { create(:order, :locale => :fr) }
     let(:mail) { ActionMailer::Base.deliveries.last }
 
     it "should use i18n email template" do

spec/spec_helper.rb

@@ -11,9 +11,9 @@
 # in spec/support/ and its subdirectories.
 Dir[File.join(File.dirname(__FILE__), "support/**/*.rb")].each {|f| require f }
 
-require 'spree/core/testing_support/factories'
-require 'spree/core/testing_support/authorization_helpers'
-require 'spree/core/testing_support/capybara_ext'
+require 'spree/testing_support/factories'
+require 'spree/testing_support/authorization_helpers'
+require 'spree/testing_support/capybara_ext'
 
 RSpec.configure do |config|
   # == Mock Framework

spree_multi_lingual.gemspec

@@ -16,8 +16,10 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.requirements << 'none'
 
-  s.add_dependency 'spree_core', '~> 1.3'
-  s.add_dependency 'spree_promo', '~> 1.3'
+  s.add_dependency 'spree_core', '~> 2.0'
+  s.add_dependency 'spree_backend', '~> 2.0'
+  s.add_dependency 'spree_frontend', '~> 2.0'
+  s.add_dependency 'spree_api', '~> 2.0'
   s.add_dependency 'i18n'
   s.add_dependency 'globalize3', '0.2.0'
   s.add_dependency 'easy_globalize3_accessors'
@@ -26,8 +28,9 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'coffee-rails'
 
-  s.add_development_dependency 'capybara', '2.0.2'
-  s.add_development_dependency 'factory_girl_rails', '~> 1.7.0'
+  s.add_development_dependency 'capybara', '2.1.0'
+  s.add_development_dependency 'spree_api', '~> 2.0'
+  s.add_development_dependency 'factory_girl_rails', '~> 4.2'
   s.add_development_dependency 'ffaker'
   s.add_development_dependency 'rspec-rails',  '~> 2.9.0'
   s.add_development_dependency 'sqlite3'
@@ -36,7 +39,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'awesome_print'
   s.add_development_dependency 'deface', '~> 1.0.0.rc2'
   s.add_development_dependency 'email_spec', '~> 1.2.1'
-  # s.add_development_dependency 'debugger'
+  s.add_development_dependency 'selenium-webdriver', '2.35.0'
   # Seems Spree doesn't require it correctly or there is a problem with extensions maybe? Still, it is needed to work with the dummy app!
+  # s.add_development_dependency 'debugger'
   s.add_development_dependency 'sass-rails'
 end