set travis test env

.travis.yml

@@ -6,4 +6,4 @@ rvm:
 before_script:
   - mysql -e 'CREATE DATABASE rendezvous_test;'
 env:
-  - DB_TEST_USER=travis
+  - DB_TEST_DATABASE=rendezvous_test DB_TEST_USER=travis

Gemfile

@@ -79,7 +79,6 @@ group :development do
   # rubocop
   gem 'rubocop'
   gem 'guard-rubocop'
-  gem 'guard-rspec'
   gem 'guard-spring'
   gem 'spring'
 end
@@ -99,10 +98,6 @@ group :test do
   gem 'coveralls', :require => false
 end
 
-group :development, :test do
-  gem 'rspec-rails'
-end
-
 # tree structure
 gem 'ancestry'
 

Gemfile.lock

@@ -9,7 +9,7 @@ GIT
 
 GIT
   remote: git://github.com/vmg/redcarpet.git
-  revision: 52c5fa3c5753d2125e827f235cdf4cb730484902
+  revision: 0c4cd0e7ea5f7f44e2953f3013fdf751af91162d
   branch: master
   specs:
     redcarpet (3.0.0)
@@ -48,13 +48,13 @@ GEM
     ast (1.1.0)
     atomic (1.1.14)
     bcrypt-ruby (3.1.2)
-    better_errors (1.0.1)
+    better_errors (1.1.0)
       coderay (>= 1.0.0)
       erubis (>= 2.6.6)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
     builder (3.1.4)
-    capybara (2.2.0)
+    capybara (2.2.1)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
@@ -89,7 +89,7 @@ GEM
       thread_safe (~> 0.1)
       warden (~> 1.2.3)
     diff-lcs (1.2.5)
-    docile (1.1.1)
+    docile (1.1.2)
     domain_name (0.5.15)
       unf (>= 0.0.5, < 1.0.0)
     erubis (2.7.0)
@@ -100,8 +100,8 @@ GEM
     factory_girl_rails (4.3.0)
       factory_girl (~> 4.3.0)
       railties (>= 3.0.0)
-    faraday (0.8.8)
-      multipart-post (~> 1.2.0)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
     ffi (1.9.3)
     formatador (0.2.4)
     gmail_xoauth (0.4.1)
@@ -112,9 +112,6 @@ GEM
       lumberjack (~> 1.0)
       pry (>= 0.9.12)
       thor (>= 0.18.1)
-    guard-rspec (4.2.3)
-      guard (~> 2.1)
-      rspec (>= 2.14, < 4.0)
     guard-rubocop (1.0.1)
       guard (~> 2.0)
       rubocop (~> 0.10)
@@ -131,14 +128,14 @@ GEM
     i18n_generators (1.2.1)
       mechanize
       rails (>= 3.0.0)
-    jbuilder (1.5.3)
+    jbuilder (2.0.2)
       activesupport (>= 3.0.0)
       multi_json (>= 1.2.0)
     jquery-rails (3.0.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.1)
-    jwt (0.1.8)
+    jwt (0.1.10)
       multi_json (>= 1.5)
     launchy (2.4.2)
       addressable (~> 2.3)
@@ -163,8 +160,8 @@ GEM
     mime-types (1.25.1)
     mini_portile (0.5.2)
     minitest (4.7.5)
-    multi_json (1.8.2)
-    multipart-post (1.2.0)
+    multi_json (1.8.4)
+    multipart-post (2.0.0)
     mysql2 (0.3.14)
     net-http-digest_auth (1.4)
     net-http-persistent (2.9)
@@ -178,17 +175,17 @@ GEM
       jwt (~> 0.1.4)
       multi_json (~> 1.0)
       rack (~> 1.2)
-    omniauth (1.1.4)
+    omniauth (1.2.1)
       hashie (>= 1.2, < 3)
-      rack
-    omniauth-google-oauth2 (0.2.1)
+      rack (~> 1.0)
+    omniauth-google-oauth2 (0.2.2)
       omniauth (~> 1.0)
       omniauth-oauth2
     omniauth-oauth2 (1.1.1)
       oauth2 (~> 0.8.0)
       omniauth (~> 1.0)
     orm_adapter (0.5.0)
-    parser (2.1.2)
+    parser (2.1.4)
       ast (~> 1.1)
       slop (~> 3.4, >= 3.4.5)
     poltergeist (1.5.0)
@@ -198,8 +195,8 @@ GEM
       websocket-driver (>= 0.2.0)
     polyglot (0.3.3)
     powerpack (0.0.9)
-    premailer (1.7.9)
-      css_parser (>= 1.1.9)
+    premailer (1.8.0)
+      css_parser (>= 1.3.5)
       htmlentities (>= 4.0.0)
     pry (0.9.12.4)
       coderay (~> 1.0)
@@ -208,7 +205,7 @@ GEM
     pry-rails (0.3.2)
       pry (>= 0.9.10)
     rack (1.5.2)
-    rack-mini-profiler (0.1.31)
+    rack-mini-profiler (0.9.0)
       rack (>= 1.1.3)
     rack-test (0.6.2)
       rack (>= 1.0)
@@ -226,24 +223,21 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbow (1.99.1)
-    rake (10.1.0)
+    rake (10.1.1)
     rb-fsevent (0.9.4)
     rb-inotify (0.9.3)
       ffi (>= 0.5.0)
-    rdoc (3.12.2)
+    rdoc (4.1.1)
       json (~> 1.4)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
     rspec-core (2.14.7)
     rspec-expectations (2.14.4)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.4)
-    rspec-rails (2.14.0)
+    rspec-rails (2.14.1)
       actionpack (>= 3.0)
+      activemodel (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
       rspec-core (~> 2.14.0)
@@ -253,14 +247,14 @@ GEM
       parser (~> 2.1)
       powerpack (~> 0.0.6)
       rainbow (>= 1.1.4)
-    sass (3.2.12)
+    sass (3.2.13)
     sass-rails (4.0.1)
       railties (>= 4.0.0, < 5.0)
       sass (>= 3.1.10)
       sprockets-rails (~> 2.0.0)
-    sdoc (0.3.20)
-      json (>= 1.1.3)
-      rdoc (~> 3.10)
+    sdoc (0.4.0)
+      json (~> 1.8)
+      rdoc (~> 4.0, < 5.0)
     simplecov (0.8.2)
       docile (~> 1.1.0)
       multi_json
@@ -294,7 +288,7 @@ GEM
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.38)
-    uglifier (2.3.2)
+    uglifier (2.4.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     unf (0.1.3)
@@ -324,7 +318,6 @@ DEPENDENCIES
   devise
   factory_girl_rails
   faraday
-  guard-rspec
   guard-rubocop
   guard-spring
   i18n_generators