Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Updated factory girl dependency

  • Loading branch information...
commit 01686a4dbad164a257808193d8eee29c7432384d 1 parent b0a2a25
Jim Jones authored
Showing with 6 additions and 7 deletions.
  1. +5 −3 Gemfile.lock
  2. +1 −1  sex_it_up.gemspec
  3. +0 −3  spec/spec_helper.rb
8 Gemfile.lock
View
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
- sex_it_up (1.1.0)
+ sex_it_up (1.1.1)
actionpack (>= 3.0.1)
activerecord (>= 3.0.1)
google-search (>= 1.0.2)
@@ -41,7 +41,8 @@ GEM
domain_name (0.5.1)
unf (~> 0.0.3)
erubis (2.7.0)
- factory_girl (1.3.2)
+ factory_girl (2.3.2)
+ activesupport
git (1.2.5)
google-search (1.0.2)
json
@@ -127,12 +128,13 @@ PLATFORMS
DEPENDENCIES
bundler (~> 1.0.0)
- factory_girl (= 1.3.2)
+ factory_girl
google-search (>= 1.0.2)
jeweler (~> 1.5.1)
mechanize (>= 1.0.0)
mocha
paperclip (>= 2.3.5)
+ rake
rspec-rails
sex_it_up!
sqlite3-ruby (~> 1.3.1)
2  sex_it_up.gemspec
View
@@ -48,7 +48,7 @@ Gem::Specification.new do |s|
s.add_runtime_dependency('mechanize',">= 1.0.0")
s.add_runtime_dependency('google-search',">= 1.0.2")
s.add_runtime_dependency('randumb')
- s.add_development_dependency('factory_girl',"= 1.3.2")
+ s.add_development_dependency('factory_girl')
s.add_development_dependency('rspec-rails')
s.add_development_dependency('mocha')
s.add_development_dependency('bundler',"~> 1.0.0")
3  spec/spec_helper.rb
View
@@ -42,9 +42,6 @@ def json_fixture name
load(File.dirname(__FILE__) + '/schema.rb')
end
-# Requires supporting files with custom matchers and macros, etc,
-# in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
Dir["#{File.dirname(__FILE__)}/helpers/**/*.rb"].each {|f| require f}
FactoryGirl.find_definitions
Please sign in to comment.
Something went wrong with that request. Please try again.