From b256182cc6e09804de202351159ac014de5197f5 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Sun, 2 Feb 2014 13:34:53 -0600 Subject: [PATCH] * VRFS-1055 and VRFS-1056 - fixing tests that hardcode / instead of /client, and updating pg gem to 17.1 from 15.1 --- db/Gemfile | 2 +- db/Gemfile.lock | 10 +++++----- ruby/Gemfile | 2 +- web/Gemfile | 2 +- web/app/controllers/users_controller.rb | 7 ++----- web/config/routes.rb | 6 +++--- web/spec/features/admin_spec.rb | 2 +- web/spec/features/home_spec.rb | 4 ++-- web/spec/features/profile_menu_spec.rb | 2 +- web/spec/features/sidebar_spec.rb | 2 +- web/spec/features/whats_next_spec.rb | 4 ++-- websocket-gateway/Gemfile | 2 +- 12 files changed, 21 insertions(+), 24 deletions(-) diff --git a/db/Gemfile b/db/Gemfile index e6d5a3717..45bf466d6 100644 --- a/db/Gemfile +++ b/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' diff --git a/db/Gemfile.lock b/db/Gemfile.lock index e9646a77c..0b59faefa 100644 --- a/db/Gemfile.lock +++ b/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) diff --git a/ruby/Gemfile b/ruby/Gemfile index 1925a2033..989804c45 100644 --- a/ruby/Gemfile +++ b/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' diff --git a/web/Gemfile b/web/Gemfile index 884ae244b..ac5e4551f 100644 --- a/web/Gemfile +++ b/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 diff --git a/web/app/controllers/users_controller.rb b/web/app/controllers/users_controller.rb index 691c5d22a..73776d76b 100644 --- a/web/app/controllers/users_controller.rb +++ b/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 diff --git a/web/config/routes.rb b/web/config/routes.rb index cad25d4b5..4c5556626 100644 --- a/web/config/routes.rb +++ b/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' diff --git a/web/spec/features/admin_spec.rb b/web/spec/features/admin_spec.rb index 19145d17e..eef4caf2e 100644 --- a/web/spec/features/admin_spec.rb +++ b/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 diff --git a/web/spec/features/home_spec.rb b/web/spec/features/home_spec.rb index a47e47cac..1585f9c73 100644 --- a/web/spec/features/home_spec.rb +++ b/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 diff --git a/web/spec/features/profile_menu_spec.rb b/web/spec/features/profile_menu_spec.rb index d04e5f876..d60a670cf 100644 --- a/web/spec/features/profile_menu_spec.rb +++ b/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() diff --git a/web/spec/features/sidebar_spec.rb b/web/spec/features/sidebar_spec.rb index e00c4b6af..35ecb1583 100644 --- a/web/spec/features/sidebar_spec.rb +++ b/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 diff --git a/web/spec/features/whats_next_spec.rb b/web/spec/features/whats_next_spec.rb index f4a96eca8..1946e622e 100644 --- a/web/spec/features/whats_next_spec.rb +++ b/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?') } diff --git a/websocket-gateway/Gemfile b/websocket-gateway/Gemfile index 52e8dd565..6634c7858 100644 --- a/websocket-gateway/Gemfile +++ b/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