Cucumber:

* Profile
* Browse code
* Sceleton for main features
* Wiki
* Commits

4 files changed, 67 insertions, 25 deletions

diff --git a/config/cucumber.yml b/config/cucumber.yml
new file mode 100644
index 00000000000..19b288df9d5
--- /dev/null
+++ b/config/cucumber.yml
@@ -0,0 +1,8 @@
+<%
+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}"
+std_opts = "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} --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.example b/config/database.yml.example
index 379469f79c5..5b5c3f0b80b 100644
--- a/config/database.yml.example
+++ b/config/database.yml.example
@@ -1,32 +1,43 @@
-development:
+#
+# PRODUCTION
+#
+production:
   adapter: mysql2
   encoding: utf8
   reconnect: false
-  database: gitlabhq_development
+  database: gitlabhq_production
   pool: 5
   username: root
   password: "secure password"
   # socket: /tmp/mysql.sock
 
-# 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:
+
+# 
+# Development specific
+#
+#
+development:
   adapter: mysql2
   encoding: utf8
   reconnect: false
-  database: gitlabhq_test
+  database: gitlabhq_development
   pool: 5
   username: root
   password: "secure password"
   # socket: /tmp/mysql.sock
 
-production:
+# 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
   adapter: mysql2
   encoding: utf8
   reconnect: false
-  database: gitlabhq_production
+  database: gitlabhq_test
   pool: 5
   username: root
   password: "secure password"
   # socket: /tmp/mysql.sock
+
+cucumber:
+  <<: *test
diff --git a/config/database.yml.mysql b/config/database.yml.mysql
index 0547d4ac8fa..99cd7eaa5cf 100644
--- a/config/database.yml.mysql
+++ b/config/database.yml.mysql
@@ -1,3 +1,21 @@
+#
+# PRODUCTION
+#
+production:
+  adapter: mysql2
+  encoding: utf8
+  reconnect: false
+  database: gitlabhq_production
+  pool: 5
+  username: root
+  password: "secure password"
+  # socket: /tmp/mysql.sock
+
+
+# 
+# Development specific
+#
+#
 development:
   adapter: mysql2
   encoding: utf8
@@ -11,7 +29,7 @@ development:
 # 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
   adapter: mysql2
   encoding: utf8
   reconnect: false
@@ -21,12 +39,5 @@ test:
   password:
   # socket: /tmp/mysql.sock
 
-production:
-  adapter: mysql2
-  encoding: utf8
-  reconnect: false
-  database: gitlabhq_production
-  pool: 5
-  username: root
-  password: "secure password"
-  # socket: /tmp/mysql.sock
+cucumber:
+  <<: *test
diff --git a/config/database.yml.sqlite b/config/database.yml.sqlite
index 51a4dd459dc..077a17ba661 100644
--- a/config/database.yml.sqlite
+++ b/config/database.yml.sqlite
@@ -1,8 +1,23 @@
+#
+# PRODUCTION
+#
 # SQLite version 3.x
 #   gem install sqlite3
 #
 #   Ensure the SQLite 3 gem is defined in your Gemfile
 #   gem 'sqlite3'
+production:
+  adapter: sqlite3
+  database: db/production.sqlite3
+  pool: 5
+  timeout: 5000
+
+
+# 
+# Development specific
+#
+#
+#
 development:
   adapter: sqlite3
   database: db/development.sqlite3
@@ -12,14 +27,11 @@ development:
 # 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
   adapter: sqlite3
   database: db/test.sqlite3
   pool: 5
   timeout: 5000
 
-production:
-  adapter: sqlite3
-  database: db/production.sqlite3
-  pool: 5
-  timeout: 5000
+cucumber:
+  <<: *test