TEST: Refactor test run.

.rspec

@@ -1,2 +1,4 @@
 --color
 --format documentation
+--require spec_helper
+--order random

.travis.yml

@@ -18,6 +18,5 @@ cache:
 install:
   - pip install --user couchapp
   - gem install poltergeist rspec
-  - spec/init.sh
 
-script: rspec --order random spec/features/*.rb
+script: ./test.sh

deploy.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+DATABASE=${1-http://localhost:5984/traduxio}
+
+echo Deploying on $DATABASE
+if ! couchapp push couchdb $DATABASE 2> /dev/null; then echo Failed; exit 1; fi

spec/features/Add_work.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 feature 'Add a work' do
 
   background do

spec/features/Compare_translations.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 feature 'Compare translations' do
 
   background 'Open work' do

spec/features/Create_translation.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 feature 'Create a translation' do
 
     given!(:work_metadata) { create_random_work }

spec/features/Delete_translation.rb

@@ -1,6 +1,3 @@
-require 'spec_helper'
-require "translation_helper"
-
 feature "Delete translations" do
   given!(:work_metadata) { create_random_work }
 

spec/features/Delete_work.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 feature 'Delete a work' do
 
   scenario 'Delete full work' do

spec/features/Internationalization.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 feature 'Localization' do
 
     scenario 'french' do

spec/features/List_works.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 feature 'List works' do
   scenario 'List languages' do
     visit '/works/'

spec/features/Search_concordance.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 feature 'Search for a concordance' do
 
   def submitForm

spec/features/Set_license.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 feature 'Set License' do
 
   background 'Open work' do

spec/init.sh

@@ -1,7 +1,9 @@
 #!/bin/bash
 
+dirname=$(dirname "$0")
+
 DATABASE=${1-http://localhost:5984/traduxio}
 
 curl -s -X DELETE $DATABASE -o /dev/null
-couchapp push couchdb $DATABASE 2> /dev/null
-$(dirname $0)/load_data.sh $DATABASE
+"$dirname"/../deploy.sh $DATABASE
+"$dirname"/load_data.sh $DATABASE

spec/run-tests.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+dirname=$(dirname "$0")
+
+rspec $dirname/features/*.rb

test.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+dirname=$(dirname "$0")
+DATABASE=${1-}
+
+"$dirname"/spec/init.sh $DATABASE && "$dirname"/spec/run-tests.sh $DATABASE