Configure Travis, remove spork, add simplecov, add turbo sprokets.

Add travis config
(cherry picked from commit e3fdb12289)

Only build on Ruby 1.9.3
(cherry picked from commit 719ef386bf)

Exclude pry from CI build
(cherry picked from commit d60935c800)

Conflicts:

	Gemfile

Attempt 2
(cherry picked from commit 2b19253895)

Conflicts:

	Gemfile.lock

Configure travis for postgres
(cherry picked from commit 3a441cd7d9)

Fix migrations that fail because of coupling to changed/removed models
(cherry picked from commit b030793f15)

Set up xvfb for Travis
(cherry picked from commit cdc3ab09a1)

Add a failing test to test travis
(cherry picked from commit 72aa8fe5e5)

Revert "Add a failing test to test travis"

This reverts commit 72aa8fe5e5.
(cherry picked from commit bd5533e2b1)

Add simplecov
(cherry picked from commit 5089d3bb22)

Conflicts:

	Gemfile.lock

Add turbo sprockets for faster asset precompile
(cherry picked from commit 3e6c56a638)

Remove spork
(cherry picked from commit ed7bded642)

Conflicts:

	spec/spec_helper.rb

Remove more spork-specific things, remove unused cuc config from zeus
(cherry picked from commit fa11ff8982)

Ensure order decorator is required, fix test fragility
(cherry picked from commit 1e94f88c5e)
This commit is contained in:
Rohan Mitchell
2013-02-24 17:36:19 +11:00
parent 249e1e013f
commit cbeffaced1
14 changed files with 112 additions and 74 deletions

View File

@@ -1,5 +1,6 @@
# Legacy table support
class Checkout < ActiveRecord::Base; end;
class Spree::Creditcard < ActiveRecord::Base; end;
class PolymorphicPayments < ActiveRecord::Migration
def up

View File

@@ -1,4 +1,7 @@
class MoveDistributorFromOrderToProduct < ActiveRecord::Migration
class Distributor < ActiveRecord::Base; end
class Spree::Product < ActiveRecord::Base; end
def up
remove_column :spree_orders, :distributor_id

View File

@@ -1,4 +1,9 @@
class ExtractDistributorAndSupplierAddressToSpreeAddress < ActiveRecord::Migration
class Supplier < ActiveRecord::Base; end
class Distributor < ActiveRecord::Base; end
class Spree::Address < ActiveRecord::Base; end
def up
# -- Distributors
add_column :distributors, :pickup_address_id, :integer

View File

@@ -1,4 +1,7 @@
class RenameDistributorsProductsToProductDistributions < ActiveRecord::Migration
class Spree::ShippingMethod < ActiveRecord::Base; end
class ProductDistribution < ActiveRecord::Base; end
def up
# Convert m2m join table into explicit join model, and add a shipping method relation and timestamps
rename_table :distributors_products, :product_distributions
@@ -9,7 +12,7 @@ class RenameDistributorsProductsToProductDistributions < ActiveRecord::Migration
end
# Set default shipping method on all product distributions
sm = Spree::ShippingMethod.first
sm = Spree::ShippingMethod.unscoped.first
ProductDistribution.update_all(:shipping_method_id => sm.id) if sm
end