Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' into bootstrap

  • Loading branch information...
commit d95481ea8b7c57d2c6609db9bf81aa475c967140 2 parents 326ac62 + d56fd33
@antekpiechnik antekpiechnik authored
View
16 .travis.yml
@@ -0,0 +1,16 @@
+language: ruby
+rvm:
+ - 1.8.7
+ - 1.9.2
+ - 1.9.3
+ - rbx-18mode
+ - ree
+env:
+ - DB=sqlite
+ - DB=mysql
+ - DB=postgres
+before_script:
+ - "cp config/database.yml.travis.$DB config/database.yml"
+ - "RAILS_ENV=test bundle exec rake db:create"
+ - "RAILS_ENV=test bundle exec rake db:migrate"
+script: bundle exec rake
View
5 Gemfile
@@ -21,6 +21,11 @@ gem "notifo"
# campfire notifications
gem "tinder"
+case ENV["DB"]
+when "mysql" then gem "mysql2", "~>0.2.0"
+when "postgres" then gem "pg"
+end
+
group :development, :test do
gem "capybara"
gem "launchy"
View
4 README.textile
@@ -13,8 +13,12 @@ BigTuna was created by "Michał Bugno":http://twitter.com/michalbugno and "Antek
* "Víctor Martínez":http://twitter.com/knoopx
* "unsay":http://twitter.com/unsay
* "Jonathan Dance":https://github.com/wuputah
+* "Pawel Obrok":https://github.com/obrok
+* "Pawel Pierzchala":https://github.com/wrozka
* ...and others (some mentioned in the "pull request * list":https://github.com/appelier/bigtuna/pulls)
+h1. Build Status !https://secure.travis-ci.org/appelier/bigtuna.png!:http://travis-ci.org/appelier/bigtuna
+
h1. License
bc.. Copyright (c) 2010 Michal Bugno, Antek Piechnik
View
6 config/database.yml.travis.mysql
@@ -0,0 +1,6 @@
+test:
+ adapter: mysql2
+ database: myapp_test
+ username:
+ encoding: utf8
+
View
4 config/database.yml.travis.postgres
@@ -0,0 +1,4 @@
+test:
+ adapter: postgresql
+ database: myapp_test
+ username: postgres
View
5 config/database.yml.travis.sqlite
@@ -0,0 +1,5 @@
+test:
+ adapter: sqlite3
+ database: "db/test.db"
+ timeout: 500
+
View
2  test/test_helper.rb
@@ -1,4 +1,4 @@
-ENV["RAILS_ENV"] = "test"
+ENV["RAILS_ENV"] ||= "test"
require File.expand_path('../../config/environment', __FILE__)
require 'rails/test_help'
require 'webmock/test_unit'
Please sign in to comment.
Something went wrong with that request. Please try again.