From 6fc45cfb46eea3796ecf8094f3f7a31160a23447 Mon Sep 17 00:00:00 2001
From: Antonio Terceiro <terceiro@colivre.coop.br>
Date: Fri, 4 Sep 2009 15:37:50 -0300
Subject: [PATCH] ActionItem1240: setting up the environment

---
 config/database.yml.dist        | 3 +++
 config/database.yml.sqlite3     | 3 +++
 config/environments/cucumber.rb | 2 +-
 features/support/env.rb         | 6 ++++++
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/config/database.yml.dist b/config/database.yml.dist
index 3648a7e..538fdca 100644
--- a/config/database.yml.dist
+++ b/config/database.yml.dist
@@ -33,3 +33,6 @@ production:
   username: root
   password: 
   host: localhost
+
+cucumber:
+  <<: *TEST
diff --git a/config/database.yml.sqlite3 b/config/database.yml.sqlite3
index 2ea54c5..0b328b6 100644
--- a/config/database.yml.sqlite3
+++ b/config/database.yml.sqlite3
@@ -9,3 +9,6 @@ test:
 production:
   adapter: sqlite3
   database: db/production.db
+
+cucumber:
+  <<: *TEST
diff --git a/config/environments/cucumber.rb b/config/environments/cucumber.rb
index 5f4ac7d..b57f986 100644
--- a/config/environments/cucumber.rb
+++ b/config/environments/cucumber.rb
@@ -17,5 +17,5 @@ config.action_mailer.delivery_method = :test
 
 config.gem "cucumber",    :lib => false,        :version => ">=0.3.11" unless File.directory?(File.join(Rails.root, 'vendor/plugins/cucumber'))
 config.gem "webrat",      :lib => false,        :version => ">=0.4.4" unless File.directory?(File.join(Rails.root, 'vendor/plugins/webrat'))
-config.gem "rspec",       :lib => false,        :version => ">=1.2.6" unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec'))
+config.gem "rspec",       :lib => 'spec',        :version => ">=1.2.6" unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec'))
 config.gem "rspec-rails", :lib => 'spec/rails', :version => ">=1.2.6" unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec-rails'))
diff --git a/features/support/env.rb b/features/support/env.rb
index dd985f3..56ffec0 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -22,3 +22,9 @@ end
 
 require 'cucumber/rails/rspec'
 require 'webrat/core/matchers'
+
+# set the very basic fixtures for Noosfero
+Fixtures.reset_cache
+fixtures_folder = File.join(RAILS_ROOT, 'test', 'fixtures')
+fixtures = ['environments', 'roles']
+Fixtures.create_fixtures(fixtures_folder, fixtures)
--
libgit2 0.21.2