From 5818a2a101cc89c778c5a5e62271ab42b1fa4c70 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Fri, 20 Dec 2013 10:53:40 -0800
Subject: fixed billing tests (added dummy billing hash to config, include
 required testing gem phantomjs-binaries)

---
 Gemfile             | 1 +
 Gemfile.lock        | 6 ++++++
 config/defaults.yml | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index e111a4e..2e0b8d0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -21,6 +21,7 @@ group :test do
   gem 'fake_braintree', require: false
   gem 'capybara', require: false
   gem 'launchy' # so save_and_open_page works in integration tests
+  gem 'phantomjs-binaries'
 end
 
 # unreleased so far ... but leap_web_certs need it
diff --git a/Gemfile.lock b/Gemfile.lock
index 918fdba..cd65c89 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -138,6 +138,7 @@ GEM
       thin
     faker (1.2.0)
       i18n (~> 0.5)
+    ffi (1.9.3)
     haml (3.1.8)
     haml-rails (0.3.5)
       actionpack (>= 3.1, < 4.1)
@@ -169,6 +170,8 @@ GEM
     multi_json (1.8.2)
     nokogiri (1.6.0)
       mini_portile (~> 0.5.0)
+    phantomjs-binaries (1.9.2.3)
+      sys-uname (= 0.9.0)
     poltergeist (1.4.1)
       capybara (~> 2.1.0)
       cliver (~> 0.2.1)
@@ -229,6 +232,8 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
+    sys-uname (0.9.0)
+      ffi (>= 1.0.0)
     therubyracer (0.10.2)
       libv8 (~> 3.3.10)
     thin (1.5.1)
@@ -277,6 +282,7 @@ DEPENDENCIES
   leap_web_help!
   leap_web_users!
   mocha (~> 0.13.0)
+  phantomjs-binaries
   poltergeist
   quiet_assets
   rails-i18n
diff --git a/config/defaults.yml b/config/defaults.yml
index a1b6235..eb31301 100644
--- a/config/defaults.yml
+++ b/config/defaults.yml
@@ -88,7 +88,7 @@ test:
   domain: test.me
   secret_token: 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
   reraise_errors: true
-  billing: true
+  billing: {}
 
 production:
   <<: *downloads
-- 
cgit v1.2.3