github-migration/engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

new factory_girl gem + fix the require pb with the devise_bushido_authenticatable gem

Browse Source
This commit is contained in:
did 2011-07-26 23:11:43 +02:00
parent 747ba0d6fa
commit abbc151ed2
5 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -8,7 +8,7 @@ gem 'rails', '3.0.9'
gem 'warden'
gem 'devise', '1.3.4'
gem 'devise_bushido_authenticatable', '1.0.0.alpha10'
gem 'devise_bushido_authenticatable', '1.0.0.alpha10', :require => 'devise_cas_authenticatable'
gem 'mongoid', '~> 2.0.2'
gem 'bson_ext', '~> 1.3.0'

38
Gemfile.lock
View File

@ -1,6 +1,6 @@
GIT
remote: git://github.com/Bushido/bushidogem.git
revision: 42dee66bb6a89d6e65e2b474289d37b0790a9913
revision: 0b4bd0f657874ee13f093350d863fc8ba7a6df6c
specs:
bushido (0.0.30)
highline (>= 1.6.1)
@ -10,9 +10,10 @@ GIT
GIT
remote: git://github.com/floehopper/mocha.git
revision: d03843e763f4e5ceadb66bcb4c530d6c5d0cb293
revision: 0ce0adc9f104a0ae2ddca400696c8694e85f1b93
specs:
mocha (0.9.12.20110213002255)
mocha (0.9.12)
metaid (~> 1.0)
GEM
remote: http://rubygems.org/
@ -23,7 +24,7 @@ GEM
Platform (0.4.0)
RedCloth (4.2.7)
SystemTimer (1.2.3)
ZenTest (4.5.0)
ZenTest (4.6.0)
abstract (1.0.0)
actionmailer (3.0.9)
actionpack (= 3.0.9)
@ -71,20 +72,20 @@ GEM
rack-test (>= 0.5.4)
selenium-webdriver (~> 0.2.0)
xpath (~> 0.1.4)
carrierwave (0.5.5)
carrierwave (0.5.6)
activesupport (~> 3.0)
cells (3.6.4)
actionpack (~> 3.0)
railties (~> 3.0)
childprocess (0.1.9)
childprocess (0.2.0)
ffi (~> 1.0.6)
columnize (0.3.3)
columnize (0.3.4)
configuration (1.3.1)
crack (0.1.8)
cucumber (1.0.0)
cucumber (1.0.2)
builder (>= 2.1.2)
diff-lcs (>= 1.1.2)
gherkin (~> 2.4.1)
gherkin (~> 2.4.5)
json (>= 1.4.6)
term-ansicolor (>= 1.0.5)
cucumber-rails (1.0.2)
@ -115,10 +116,10 @@ GEM
rack
erubis (2.6.6)
abstract (>= 1.0.0)
excon (0.6.3)
factory_girl (1.3.3)
factory_girl_rails (1.0.1)
factory_girl (~> 1.3)
excon (0.6.5)
factory_girl (2.0.1)
factory_girl_rails (1.1.0)
factory_girl (~> 2.0.0)
railties (>= 3.0.0)
ffi (1.0.9)
fog (0.8.2)
@ -130,12 +131,12 @@ GEM
net-ssh (>= 2.1.3)
nokogiri (>= 1.4.4)
ruby-hmac
formatador (0.1.4)
formatador (0.2.0)
formtastic (1.2.4)
actionpack (>= 2.3.7)
activesupport (>= 2.3.7)
i18n (~> 0.4)
gherkin (2.4.1)
gherkin (2.4.5)
json (>= 1.4.6)
growl-glue (1.0.7)
haml (3.1.2)
@ -155,7 +156,7 @@ GEM
yui-compressor (>= 0.9.3)
json (1.5.3)
json_pure (1.5.3)
kgio (2.5.0)
kgio (2.6.0)
launchy (0.3.7)
configuration (>= 0.0.5)
rake (>= 0.8.1)
@ -174,6 +175,7 @@ GEM
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
metaid (1.0)
mime-types (1.16)
mimemagic (0.1.8)
mimetype-fu (0.1.2)
@ -187,7 +189,7 @@ GEM
nokogiri (1.5.0)
open4 (1.1.0)
orm_adapter (0.0.5)
pickle (0.4.7)
pickle (0.4.8)
cucumber (>= 0.8)
rake
polyglot (0.3.1)
@ -265,7 +267,7 @@ GEM
json_pure
rubyzip
spork (0.8.5)
term-ansicolor (1.0.5)
term-ansicolor (1.0.6)
thor (0.14.6)
treetop (1.4.9)
polyglot (>= 0.3.1)

1
config/mongoid.yml
View File

@ -10,7 +10,6 @@ defaults: &defaults
development:
<<: *defaults
database: locomotive_dev
# database: locomotive_cas_dev
test:
<<: *defaults

2
spec/spec_helper.rb
View File

@ -5,7 +5,7 @@ require File.expand_path('../../config/environment', __FILE__)
require 'rspec/rails'
require 'factory_girl'
Factory.find_definitions
FactoryGirl.find_definitions
# Requires supporting ruby files with custom matchers and macros, etc,
# in spec/support/ and its subdirectories.

2
spec/support/locomotive.rb
View File

@ -30,7 +30,7 @@ def Locomotive.configure_for_test(force = false)
Object.send(:remove_const, 'Site') if Object.const_defined?('Site')
load 'site.rb'
Factory.factories.clear
FactoryGirl.factories.clear
load File.join(Rails.root, 'spec', 'factories.rb')
end
end