Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Configure Travis, remove spork, add simplecov, add turbo sprokets.
Add travis config (cherry picked from commit e3fdb12) Only build on Ruby 1.9.3 (cherry picked from commit 719ef38) Exclude pry from CI build (cherry picked from commit d60935c) Conflicts: Gemfile Attempt 2 (cherry picked from commit 2b19253) Conflicts: Gemfile.lock Configure travis for postgres (cherry picked from commit 3a441cd) Fix migrations that fail because of coupling to changed/removed models (cherry picked from commit b030793) Set up xvfb for Travis (cherry picked from commit cdc3ab0) Add a failing test to test travis (cherry picked from commit 72aa8fe) Revert "Add a failing test to test travis" This reverts commit 72aa8fe. (cherry picked from commit bd5533e) Add simplecov (cherry picked from commit 5089d3b) Conflicts: Gemfile.lock Add turbo sprockets for faster asset precompile (cherry picked from commit 3e6c56a) Remove spork (cherry picked from commit ed7bded) Conflicts: spec/spec_helper.rb Remove more spork-specific things, remove unused cuc config from zeus (cherry picked from commit fa11ff8) Ensure order decorator is required, fix test fragility (cherry picked from commit 1e94f88)
- Loading branch information
Showing
14 changed files
with
121 additions
and
83 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -29,3 +29,4 @@ public/spree | |
config/abr.yml | ||
config/heroku_env.rb | ||
NERD_tree* | ||
coverage |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
language: ruby | ||
bundler_args: --without development | ||
rvm: | ||
- "1.9.3" | ||
services: postgresql | ||
before_install: | ||
- "export DISPLAY=:99.0" | ||
- "sh -e /etc/init.d/xvfb start" | ||
before_script: | ||
- cp config/database.travis.yml config/database.yml | ||
- psql -c 'create database open_food_web_test;' -U postgres | ||
script: | ||
- RAILS_ENV=test bundle exec rake db:migrate --trace | ||
- export DISPLAY=:99.0 && bundle exec rake spec |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
test: | ||
adapter: postgresql | ||
database: open_food_web_test | ||
username: postgres |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 3 additions & 0 deletions
3
db/migrate/20120618061537_move_distributor_from_order_to_product.rb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 5 additions & 0 deletions
5
db/migrate/20120626013846_extract_distributor_and_supplier_address_to_spree_address.rb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,12 @@ | ||
#!/usr/bin/env ruby | ||
# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application. | ||
|
||
if ENV['RAILS_ENV'] == 'test' | ||
require 'simplecov' | ||
SimpleCov.start 'rails' | ||
puts "required simplecov" | ||
end | ||
|
||
APP_PATH = File.expand_path('../../config/application', __FILE__) | ||
require File.expand_path('../../config/boot', __FILE__) | ||
require 'rails/commands' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters