From b1a6248004e5d0e548bee1cc58e1b9b8c2a06dd7 Mon Sep 17 00:00:00 2001 From: Thibault Jouan Date: Thu, 30 Apr 2015 14:08:01 +0000 Subject: [PATCH 1/6] Enable travis CI fast finish --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 8b06795..e83dcd7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ rvm: - 2.1 - rbx-2 matrix: + fast_finish: true allow_failures: - rvm: ruby-head - rvm: rbx-2 From 14e255eeb0917370086e8f6f15ee3dfd4c3c9cd4 Mon Sep 17 00:00:00 2001 From: Thibault Jouan Date: Thu, 30 Apr 2015 13:57:52 +0000 Subject: [PATCH 2/6] Configure database for travis CI --- .travis.yml | 3 +++ config/database.yml.travis | 4 ++++ 2 files changed, 7 insertions(+) create mode 100644 config/database.yml.travis diff --git a/.travis.yml b/.travis.yml index e83dcd7..9a3c1aa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,9 @@ rvm: - 2.0 - 2.1 - rbx-2 +before_script: + - cp config/database.yml.travis config/database.yml + - bundle exec rake db:create db:migrate db:test:prepare matrix: fast_finish: true allow_failures: diff --git a/config/database.yml.travis b/config/database.yml.travis new file mode 100644 index 0000000..d70c441 --- /dev/null +++ b/config/database.yml.travis @@ -0,0 +1,4 @@ +test: + adapter: postgresql + database: travis_ci_test + username: postgres From a38da387d25e81ea6b32c5dd15dfc0933b11d6d8 Mon Sep 17 00:00:00 2001 From: Thibault Jouan Date: Thu, 30 Apr 2015 14:19:50 +0000 Subject: [PATCH 3/6] Configure secret_key_base for travis CI --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 9a3c1aa..30b790c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,8 @@ rvm: before_script: - cp config/database.yml.travis config/database.yml - bundle exec rake db:create db:migrate db:test:prepare + # GNU echo requires non-stardard option `-e' to interpret escapes sequences + - 'echo -e "test:\n secret_key_base: $(bundle exec rake secret)" > config/secrets.yml' matrix: fast_finish: true allow_failures: From 62ea95af56977cef9bdfdb8f9e277ff64328ac36 Mon Sep 17 00:00:00 2001 From: Thibault Jouan Date: Thu, 30 Apr 2015 19:56:31 +0000 Subject: [PATCH 4/6] Fix travis CI script configuration --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 30b790c..bb784bf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,7 @@ before_script: - bundle exec rake db:create db:migrate db:test:prepare # GNU echo requires non-stardard option `-e' to interpret escapes sequences - 'echo -e "test:\n secret_key_base: $(bundle exec rake secret)" > config/secrets.yml' +script: bundle exec rspec matrix: fast_finish: true allow_failures: From d4d0382e4c99c23d6b7288436d937ea85fc36670 Mon Sep 17 00:00:00 2001 From: Thibault Jouan Date: Thu, 30 Apr 2015 19:35:28 +0000 Subject: [PATCH 5/6] Remove `sounds_path' modification in spec_helper Since e90bb01c, we already configure a different path for test environment from application configuration. --- spec/spec_helper.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 14fc638..935da66 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -11,7 +11,6 @@ Spork.prefork do config.infer_spec_type_from_file_location! config.mock_with :rspec config.use_transactional_fixtures = true - Rails.configuration.sounds_path = "#{Rails.root}/tmp/spec/data/sounds" config.after(:all) do `rm -f #{Rails.configuration.sounds_path}/*` end From 90da5e4490b56575237049729cf37937027d5d11 Mon Sep 17 00:00:00 2001 From: Thibault Jouan Date: Fri, 1 May 2015 10:09:08 +0000 Subject: [PATCH 6/6] Configure travis CI to create initial directories --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index bb784bf..258e85a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,7 @@ before_script: - bundle exec rake db:create db:migrate db:test:prepare # GNU echo requires non-stardard option `-e' to interpret escapes sequences - 'echo -e "test:\n secret_key_base: $(bundle exec rake secret)" > config/secrets.yml' + - mkdir -p data/sounds data/test/sounds script: bundle exec rspec matrix: fast_finish: true