Merge branch 'master' into rose

5 files changed, 47 insertions, 0 deletions

diff --git a/Gemfile b/Gemfile
index 924ced4..0d7ffd9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -34,6 +34,7 @@ end
 
 group :development, :test do
   gem 'rspec-rails'
+  gem 'rspec-fakes'
   gem 'teaspoon'
   gem 'capybara'
   gem 'dotenv-rails'
diff --git a/Gemfile.lock b/Gemfile.lock
index 9a3734f..0bd79b3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -46,6 +46,9 @@ GEM
       execjs
     coffee-script-source (1.6.3)
     database_cleaner (1.0.1)
+    developwithpassion_arrays (0.0.1)
+    developwithpassion_fakes (0.1.1)
+      developwithpassion_arrays
     diff-lcs (1.2.4)
     dotenv (0.8.0)
     dotenv-rails (0.8.0)
@@ -108,9 +111,16 @@ GEM
     rake (10.1.0)
     rdoc (3.12.2)
       json (~> 1.4)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
     rspec-core (2.14.3)
     rspec-expectations (2.14.0)
       diff-lcs (>= 1.1.3, < 2.0)
+    rspec-fakes (0.0.9)
+      developwithpassion_fakes
+      rspec
     rspec-mocks (2.14.1)
     rspec-rails (2.14.0)
       actionpack (>= 3.0)
@@ -180,6 +190,7 @@ DEPENDENCIES
   jquery-rails
   pg
   rails (= 4.0.0)
+  rspec-fakes
   rspec-rails
   sass-rails (~> 4.0.0)
   sdoc
diff --git a/config/database.yml.example b/config/database.yml.example
new file mode 100644
index 0000000..e3b0ccf
--- /dev/null
+++ b/config/database.yml.example
@@ -0,0 +1,29 @@
+development:
+  adapter: postgresql
+  encoding: unicode
+  min_messages: warning
+  database: parley_development
+  host: localhost
+  pool: 5
+  username: parley_app
+  password: postgres
+
+test:
+  adapter: postgresql
+  encoding: unicode
+  min_messages: warning
+  database: parley_test
+  host: localhost
+  pool: 5
+  username: parley_app
+  password: postgres
+
+production:
+  adapter: postgresql
+  encoding: unicode
+  min_messages: warning
+  database: parley_production
+  host: localhost
+  pool: 5
+  username: parley_app
+  password: postgres
diff --git a/spec/factories/sign_ups_factory.rb b/spec/factories/sign_ups_factory.rb
new file mode 100644
index 0000000..b099344
--- /dev/null
+++ b/spec/factories/sign_ups_factory.rb
@@ -0,0 +1,5 @@
+FactoryGirl.define do
+  factory :sign_up do
+
+  end
+end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index a4172d1..3d49429 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -54,6 +54,7 @@ RSpec.configure do |config|
   # the seed, which is printed after each run.
   #     --seed 1234
   config.order = "random"
+  config.include FactoryGirl::Syntax::Methods
   config.before(:suite) do
     DatabaseCleaner.strategy = :transaction
     DatabaseCleaner.clean_with(:truncation)