diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/cucumber.yml | 13 | ||||
| -rw-r--r-- | config/database.yml | 7 |
2 files changed, 18 insertions, 2 deletions
diff --git a/config/cucumber.yml b/config/cucumber.yml new file mode 100644 index 000000000..836931b61 --- /dev/null +++ b/config/cucumber.yml @@ -0,0 +1,13 @@ +<% +rerun = File.file?('rerun.txt') ? IO.read('rerun.txt') : "" +rerun_opts = rerun.to_s.strip.empty? ? "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} features" : "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} #{rerun}" + +if ENV['JOB_NAME'] + ci_opts = "--format json --out cucumber.json --format html --out cucumber.html" +end + +std_opts = "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} #{ci_opts} --strict --tags ~@wip" +%> +default: <%= std_opts %> features +wip: --tags @wip:3 --wip features +rerun: <%= rerun_opts %> --format rerun --out rerun.txt --strict --tags ~@wip diff --git a/config/database.yml b/config/database.yml index 81951d183..2a3ddf5d0 100644 --- a/config/database.yml +++ b/config/database.yml @@ -10,15 +10,18 @@ default: &default development: <<: *default - database: chouette_dev + database: chouette2 # Warning: The database defined as "test" will be erased and # re-generated from your development database when you run "rake". # Do not set this db to the same as development or production. -test: +test: &test <<: *default database: chouette_test production: <<: *default database: chouette2 + +cucumber: + <<: *test |