Upgrade 2-4-stable to Solidus

.gitignore

@@ -9,3 +9,4 @@ nbproject
 *.swp
 spec/dummy
 pkg
+Gemfile.lock

.travis.yml

@@ -0,0 +1,15 @@
+language: ruby
+rvm:
+  - 2.1
+  - 2.2
+sudo: false
+cache: bundler
+env:
+  matrix:
+    - SOLIDUS_BRANCH=master
+    - SOLIDUS_BRANCH=v1.2
+    - SOLIDUS_BRANCH=v1.1
+before_script:
+  - bundle exec rake test_app
+script:
+  - bundle exec rspec spec

Gemfile

@@ -1,21 +1,11 @@
 source 'http://rubygems.org'
 
-gem 'guard'
-gem 'guard-rspec'
-gem 'rb-inotify', :require => false
-gem 'rb-fsevent', :require => false
-gem 'rb-fchange', :require => false
-gem 'libnotify'
-gem 'database_cleaner'
-gem 'rspec-rails'
-gem 'fuubar'
-gem 'debugger'
-gem 'pry-rails'
-gem 'factory_girl_rails', '~> 1.7.0'
-gem 'faker'
-gem 'pry'
-gem 'pry-debugger'
-gem 'pry-rescue'
-gem 'spree_core', '~> 1.3.0'
+branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
+gem 'solidus', github: 'solidusio/solidus', branch: branch
+
+# Provides basic authentication functionality for testing parts of your engine
+group :development, :test do
+  gem 'solidus_auth_devise'
+end
 
 gemspec

Rakefile

@@ -2,7 +2,7 @@ require 'bundler'
 Bundler::GemHelper.install_tasks
 
 require 'rspec/core/rake_task'
-require 'spree/core/testing_support/common_rake'
+require 'spree/testing_support/extension_rake'
 
 RSpec::Core::RakeTask.new
 
@@ -11,5 +11,5 @@ task :default => [:spec]
 desc 'Generates a dummy app for testing'
 task :test_app do
   ENV['LIB_NAME'] = 'spree_product_feed'
-  Rake::Task['common:test_app'].invoke
+  Rake::Task['extension:test_app'].invoke
 end

app/views/spree/products/index.rss.builder

@@ -1,15 +1,15 @@
-xml.instruct! :xml, :version=>"1.0" 
+xml.instruct! :xml, :version=>"1.0"
 xml.rss(:version=>"2.0", "xmlns:g" => "http://base.google.com/ns/1.0"){
   xml.channel{
-    xml.title("#{Spree::Config[:site_name]}")
-    xml.link("http://#{Spree::Config[:site_url]}")
-    xml.description("Find out about new products on http://#{Spree::Config[:site_url]} first!")
+    xml.title(current_store.name)
+    xml.link("http://#{current_store.url}")
+    xml.description("Find out about new products on http://#{current_store.url} first!")
     xml.language('en-us')
     @products.each do |product|
       xml.item do
         xml.title(product.name)
         xml.description((product.images.count > 0 ? link_to(image_tag(product.images.first.attachment.url(:product)), product_url(product)) : '') + simple_format(product.description))
-        xml.author(Spree::Config[:site_url])
+        xml.author(current_store.url)
         xml.pubDate((product.available_on || product.created_at).strftime("%a, %d %b %Y %H:%M:%S %z"))
         xml.link(product_url(product))
         xml.guid(product.id)