Skip to content

Commit

Permalink
setting gem versions, and fixing build
Browse files Browse the repository at this point in the history
  • Loading branch information
voodoorai2000 committed Jun 28, 2010
1 parent 2c773b2 commit 69c6131
Show file tree
Hide file tree
Showing 7 changed files with 32 additions and 30 deletions.
17 changes: 9 additions & 8 deletions config/environments/cucumber.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,15 @@

ENV['AUTOFEATURE'] = "true"

config.gem 'cucumber-rails', :lib => false, :version => '>=0.2.4' unless File.directory?(File.join(Rails.root, 'vendor/plugins/cucumber-rails'))
config.gem 'database_cleaner', :lib => false, :version => '>=0.4.3' unless File.directory?(File.join(Rails.root, 'vendor/plugins/database_cleaner'))
config.gem 'webrat', :lib => false, :version => '>=0.6.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/webrat'))
config.gem 'rspec', :lib => false, :version => '>=1.3.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec'))
config.gem 'rspec-rails', :lib => false, :version => '>=1.3.2' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec-rails'))
config.gem 'autotest-rails', :lib => false, :version => '>=4.1.0'
config.gem 'autotest-growl', :lib => false, :version => '>=0.1.7'
config.gem 'ZenTest', :lib => false, :version => '>=4.2.1'
config.gem 'cucumber', :lib => false, :version => '0.8.3' unless File.directory?(File.join(Rails.root, 'vendor/plugins/cucumber'))
config.gem 'cucumber-rails', :lib => false, :version => '0.2.4' unless File.directory?(File.join(Rails.root, 'vendor/plugins/cucumber-rails'))
config.gem 'database_cleaner', :lib => false, :version => '0.4.3' unless File.directory?(File.join(Rails.root, 'vendor/plugins/database_cleaner'))
config.gem 'webrat', :lib => false, :version => '0.6.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/webrat'))
config.gem 'rspec', :lib => false, :version => '1.3.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec'))
config.gem 'rspec-rails', :lib => false, :version => '1.3.2' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec-rails'))
config.gem 'autotest-rails', :lib => false, :version => '4.1.0'
config.gem 'autotest-growl', :lib => false, :version => '0.1.7'
#config.gem 'ZenTest', :lib => false, :version => '>=4.2.1'
config.gem 'mundo-pepino', :lib => false, :version => '0.1.9'
config.gem 'delorean'
config.gem "adzap-ar_mailer", :lib => 'action_mailer/ar_mailer', :source => 'http://gems.github.com'
Expand Down
17 changes: 9 additions & 8 deletions db/schema.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#
# It's strongly recommended to check this file into your version control system.

ActiveRecord::Schema.define(:version => 20100203131707) do
ActiveRecord::Schema.define(:version => 20100523214309) do

create_table "areas", :force => true do |t|
t.string "name"
Expand Down Expand Up @@ -88,23 +88,23 @@

create_table "users", :force => true do |t|
t.string "name"
t.string "email", :null => false
t.string "email", :null => false
t.string "login"
t.string "crypted_password"
t.string "password_salt"
t.string "persistence_token", :null => false
t.string "perishable_token", :null => false
t.string "single_access_token", :null => false
t.integer "login_count", :default => 0, :null => false
t.integer "failed_login_count", :default => 0, :null => false
t.string "persistence_token", :null => false
t.string "perishable_token", :null => false
t.string "single_access_token", :null => false
t.integer "login_count", :default => 0, :null => false
t.integer "failed_login_count", :default => 0, :null => false
t.datetime "last_request_at"
t.datetime "last_login_at"
t.datetime "current_login_at"
t.string "last_login_ip"
t.string "current_login_ip"
t.string "openid_identifier"
t.integer "invitation_id"
t.integer "invitation_limit", :default => 0, :null => false
t.integer "invitation_limit", :default => 0, :null => false
t.boolean "admin"
t.datetime "created_at"
t.datetime "updated_at"
Expand All @@ -115,6 +115,7 @@
t.string "age"
t.string "gender"
t.text "more_info"
t.integer "facebook_uid", :limit => 8
end

add_index "users", ["last_request_at"], :name => "index_users_on_last_request_at"
Expand Down
1 change: 1 addition & 0 deletions features/support/env.rb
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
# http://github.com/bmabey/database_cleaner for more info.
require 'database_cleaner'
DatabaseCleaner.strategy = :truncation
DatabaseCleaner.clean_with :truncation

require 'factory_girl'

Expand Down
9 changes: 6 additions & 3 deletions features/support/mundo_pepino_es_ES.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

# MODELOS PARA LIMPIAR antes de cada escenario,
# por ejemplo:
# Orchard, Terrace, Crop...
#User
]

config.model_mappings = {
Expand Down Expand Up @@ -56,8 +56,11 @@
end


Before do
MundoPepino.clean_models
DatabaseCleaner.strategy = :truncation
DatabaseCleaner.clean_with :truncation

After do
DatabaseCleaner.clean
end

#module MundoPepino
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
# ActionMailer::Base.deliveries array.
config.action_mailer.delivery_method = :test

config.gem 'cucumber', :lib => false, :version => '>=0.4.2' unless File.directory?(File.join(Rails.root, 'vendor/plugins/cucumber'))
config.gem 'cucumber', :lib => false, :version => '0.8.3' unless File.directory?(File.join(Rails.root, 'vendor/plugins/cucumber'))
#config.gem 'webrat', :lib => false, :version => '>=0.5.3' unless File.directory?(File.join(Rails.root, 'vendor/plugins/webrat'))
config.gem 'rspec', :lib => false, :version => '>=1.2.9' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec'))
config.gem 'rspec-rails', :lib => false, :version => '>=1.2.9' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec-rails'))
config.gem 'rspec', :lib => false, :version => '1.3.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec'))
config.gem 'rspec-rails', :lib => false, :version => '1.3.2' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec-rails'))
config.gem 'bmabey-email_spec', :lib => 'email_spec', :source => 'http://gems.github.com', :version => '>=0.3.4'
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,3 @@
u.activate!({:login => hash['login'], :password => hash['password'], :password_confirmation => hash['password']}, false) {}
end
end

Factory.define :user do |f|
f.sequence(:name) { |n| "name#{n}" }
f.sequence(:login) { |n| "foo#{n}" }
f.password "foobar"
f.password_confirmation { |u| u.password }
f.sequence(:email) { |n| "foo#{n}@example.com" }
end
4 changes: 4 additions & 0 deletions vendor/plugins/authentication_engine/features/support/env.rb
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,11 @@
# http://github.com/bmabey/database_cleaner for more info.
require 'database_cleaner'
DatabaseCleaner.strategy = :truncation
DatabaseCleaner.clean_with :truncation

After do
DatabaseCleaner.clean
end

require 'factory_girl'

Expand Down

0 comments on commit 69c6131

Please sign in to comment.