* VRFS-1055 and VRFS-1056 - fixing tests that hardcode / instead of /client, and updating pg gem to 17.1 from 15.1

db/Gemfile

@@ -3,4 +3,4 @@ source 'https://rubygems.org'
 # Assumes you have already cloned pg_migrate_ruby in your workspace
 # $ cd [workspace]
 # $ git clone https://github.com/sethcall/pg_migrate_ruby
-gem 'pg_migrate', '0.1.11'
+gem 'pg_migrate', '0.1.12'

db/Gemfile.lock

@@ -4,11 +4,11 @@ GEM
     little-plugger (1.1.3)
     logging (1.7.2)
       little-plugger (>= 1.1.3)
-    pg (0.15.1)
-    pg (0.15.1-x86-mingw32)
-    pg_migrate (0.1.11)
+    pg (0.17.1)
+    pg (0.17.1-x86-mingw32)
+    pg_migrate (0.1.12)
       logging (= 1.7.2)
-      pg (= 0.15.1)
+      pg (= 0.17.1)
       thor (= 0.15.4)
     thor (0.15.4)
 
@@ -17,4 +17,4 @@ PLATFORMS
   x86-mingw32
 
 DEPENDENCIES
-  pg_migrate (= 0.1.11)
+  pg_migrate (= 0.1.12)

ruby/Gemfile

@@ -15,7 +15,7 @@ else
   ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] ||= "true"
 end
 
-gem 'pg', '0.15.1', :platform => [:mri, :mswin, :mingw]
+gem 'pg', '0.17.1', :platform => [:mri, :mswin, :mingw]
 gem 'jdbc_postgres', :platform => [:jruby]
 
 gem 'activerecord', '3.2.13'

web/Gemfile

@@ -31,7 +31,7 @@ gem 'bootstrap-will_paginate', '0.0.6'
 gem 'em-websocket', '>=0.4.0' #, :path => '/Users/seth/workspace/em-websocket'
 gem 'uuidtools', '2.1.2'
 gem 'ruby-protocol-buffers', '1.2.2'
-gem 'pg', '0.15.1'
+gem 'pg', '0.17.1'
 gem 'compass-rails'
 gem 'rabl' # for JSON API development
 gem 'gon', '~>4.1.0' # for passthrough of Ruby variables to Javascript variables

web/app/controllers/users_controller.rb

@@ -23,7 +23,7 @@ class UsersController < ApplicationController
 
   def new
     if current_user
-      redirect_to :root
+      redirect_to client_url
       return
     end
 
@@ -51,7 +51,7 @@ class UsersController < ApplicationController
 
   def create
     if current_user
-      redirect_to :root
+      redirect_to client_url
       return
     end
 
@@ -121,9 +121,6 @@ class UsersController < ApplicationController
   end
 
   def welcome
-    if current_user
-
-    end
     @hide_user_dropdown = true
     render :layout => "web"
   end

web/config/routes.rb

@@ -9,10 +9,10 @@ SampleApp::Application.routes.draw do
   resources :sessions, only: [:new, :create, :destroy]
 
   #root to: 'static_pages#home'
-  root to: 'clients#index'
-  #root to: 'users#welcome'
+  #root to: 'clients#index'
+  root to: 'users#welcome'
 
-  match '/welcome', to: 'users#welcome'
+  #match '/welcome', to: 'users#welcome'
   # This page is still here, and is under test. Keep a route to it.
   match '/oldhome', to: 'static_pages#home'
 

web/spec/features/admin_spec.rb

@@ -17,7 +17,7 @@ describe "Admin", :js => true, :type => :feature, :capybara_feature => true do
   before(:each) do
     UserMailer.deliveries.clear
     sign_in_poltergeist user
-    visit "/"
+    visit "/client"
     find('h2', text: 'musicians')
   end
 

web/spec/features/home_spec.rb

@@ -115,7 +115,7 @@ describe "Home Screen", :js => true, :type => :feature, :capybara_feature => tru
       UserMailer.deliveries.clear
       page.driver.headers = { 'User-Agent' => ' JamKazam ' }
       sign_in_poltergeist user
-      visit "/"
+      visit "/client"
     end
 
     it_behaves_like :has_footer
@@ -133,7 +133,7 @@ describe "Home Screen", :js => true, :type => :feature, :capybara_feature => tru
       UserMailer.deliveries.clear
       page.driver.headers = { 'User-Agent' => 'Firefox' }
       sign_in_poltergeist user
-      visit "/"
+      visit "/client"
     end
 
     it_behaves_like :has_footer

web/spec/features/profile_menu_spec.rb

@@ -90,7 +90,7 @@ describe "Profile Menu", :js => true, :type => :feature, :capybara_feature => tr
     before(:each) do
       UserMailer.deliveries.clear
       sign_in_poltergeist user
-      visit "/"
+      visit "/client"
       find('h2', text: 'musicians')
       # open menu
       find('.userinfo').hover()

web/spec/features/sidebar_spec.rb

@@ -15,7 +15,7 @@ describe "Profile Menu", :js => true, :type => :feature, :capybara_feature => tr
   before(:each) do
     UserMailer.deliveries.clear
     sign_in_poltergeist user
-    visit "/"
+    visit "/client"
     find('h2', text: 'musicians')
   end
 

web/spec/features/whats_next_spec.rb

@@ -13,7 +13,7 @@ describe "Home Screen", :js => true, :type => :feature, :capybara_feature => tru
   before(:each) do
     sign_in_poltergeist user
     page.driver.headers = { 'User-Agent' => ' JamKazam ' }
-    visit "/"
+    visit "/client"
 
   end
 
@@ -63,7 +63,7 @@ describe "Home Screen", :js => true, :type => :feature, :capybara_feature => tru
           # needed because we poke the server with an updateUser call, but their is no indication in the UI that it's done
           wait_for_ajax
           page.driver.headers = { 'User-Agent' => ' JamKazam ' }
-          visit "/"
+          visit "/client"
           wait_until_curtain_gone
           should_not have_selector('h1',    text: 'what\'s next?')
         }

websocket-gateway/Gemfile

@@ -56,7 +56,7 @@ group :test do
     gem 'database_cleaner', '0.7.0'
     gem 'guard', '>= 0.10.0'
     gem 'guard-rspec', '>= 0.7.3'
-    gem 'pg_migrate','0.1.11' #:path => "#{workspace}/pg_migrate_ruby"
+    gem 'pg_migrate','0.1.12' #:path => "#{workspace}/pg_migrate_ruby"
     gem 'evented-spec'
 end