Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Added travis-ci config

  • Loading branch information...
commit 34b8b9ddac0b3182808f03a75790fc4548454ddc 1 parent 67533da
Fred Wu authored
6 Gemfile
View
@@ -38,9 +38,9 @@ group :assets do
end
group :development, :test do
- gem 'capybara', '~> 1.1.2'
- gem 'rspec-rails', '~> 2.8.1'
- gem 'machinist', '~> 2.0.0.beta2'
+ gem 'capybara', '~> 1.1.2'
+ gem 'rspec-rails', '~> 2.8.1'
+ gem 'factory_girl_rails', '~> 1.7.0', :require => false
gem 'ffaker'
gem 'delorean'
gem 'database_cleaner'
8 Gemfile.lock
View
@@ -69,6 +69,11 @@ GEM
erubis (2.7.0)
execjs (1.3.0)
multi_json (~> 1.0)
+ factory_girl (2.6.1)
+ activesupport (>= 2.3.9)
+ factory_girl_rails (1.7.0)
+ factory_girl (~> 2.6.0)
+ railties (>= 3.0.0)
ffaker (1.13.0)
ffi (1.0.11)
geo_location (0.4.2)
@@ -91,7 +96,6 @@ GEM
launchy (2.0.5)
addressable (~> 2.2.6)
libv8 (3.3.10.4)
- machinist (2.0)
mail (2.4.1)
i18n (>= 0.4.0)
mime-types (~> 1.16)
@@ -220,6 +224,7 @@ DEPENDENCIES
devise (~> 2.0.0)
email_spec
execjs
+ factory_girl_rails (~> 1.7.0)
ffaker
geo_location
has_scope
@@ -227,7 +232,6 @@ DEPENDENCIES
jquery-rails
kaminari
launchy
- machinist (~> 2.0.0.beta2)
mini_magick
modernizr-rails
mysql2
2  db/seeds_for_dev.rb
View
@@ -20,7 +20,7 @@
# more users
-User.make!(40)
+40.times { User.make! }
User.all.each { |u| u.confirm! }
# investors and startups
2  spec/controllers/proposals_controller_spec.rb
View
@@ -13,7 +13,7 @@
end
it "shows the edit page" do
- investors = User.make!(2)
+ investors = [User.make!, User.make!]
proposal = Proposal.make!(
:startup => startup,
:investors => investors
16 spec/support/blueprints.rb
View
@@ -1,14 +1,16 @@
-require 'machinist/active_record'
+require 'factory_girl'
+require 'factory_girl/syntax/blueprint'
+require 'factory_girl/syntax/make'
User.blueprint do
u_name = Faker::Name.name
- username { "user_#{sn}" }
- name { u_name }
- email { Faker::Internet.email(u_name) }
- location { Faker::Address.city }
- introduction { Faker::Lorem.sentence }
- password { 'password' }
+ sequence(:username) { |n| "user_#{n}" }
+ name { u_name }
+ email { Faker::Internet.email(u_name) }
+ location { Faker::Address.city }
+ introduction { Faker::Lorem.sentence }
+ password { 'password' }
end
InvestorProfile.blueprint do
Please sign in to comment.
Something went wrong with that request. Please try again.