From 68af245c2e5d323d3fa70b8e0c09ecbf494fb17e Mon Sep 17 00:00:00 2001 From: Seth Call Date: Tue, 29 Jan 2013 21:42:50 -0600 Subject: [PATCH] * removing libv8 dependency temporarily because latest therubyracer makes it a dependency --- Gemfile | 11 ++++++----- config/routes.rb | 3 +++ features/support/env.rb | 1 + 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 354a0bb7b..bd4b834d8 100644 --- a/Gemfile +++ b/Gemfile @@ -44,9 +44,9 @@ gem 'recaptcha', '0.3.4' gem 'filepicker-rails', '0.0.2' gem 'aws-sdk', '1.8.0' -group :libv8 do - gem 'libv8', "~> 3.11.8" -end +#group :libv8 do +# gem 'libv8', "~> 3.11.8" +#end group :development, :test do gem 'rspec-rails' @@ -54,7 +54,7 @@ group :development, :test do gem 'jasmine', '1.3.1' gem 'pry' gem 'execjs', '1.4.0' - gem 'therubyracer', '0.11.0beta8' + gem 'therubyracer' #, '0.11.0beta8' end # Gems used only for assets and not required @@ -66,7 +66,8 @@ group :assets do end group :test, :cucumber do - gem 'capybara', '1.1.2' + gem 'capybara' + gem 'capybara-screenshot' gem 'cucumber-rails' #, '1.3.0', :require => false gem 'factory_girl_rails', '4.1.0' gem 'database_cleaner', '0.7.0' diff --git a/config/routes.rb b/config/routes.rb index a7150464e..c65acf776 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -39,6 +39,9 @@ SampleApp::Application.routes.draw do match '/reset_password_token' => 'users#reset_password_token', :via => :get match '/reset_password_complete' => 'users#reset_password_complete', :via => :post + # version check for JamClient + match '/versioncheck' => 'artifacts#versioncheck' + scope '/api' do # music sessions match '/sessions/:id/participants' => 'api_music_sessions#participant_create', :via => :post diff --git a/features/support/env.rb b/features/support/env.rb index 7e802d9ce..8dc97c366 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -7,6 +7,7 @@ # force cucumber environment ENV['RAILS_ENV'] = 'cucumber' +require 'capybara-screenshot/cucumber' # https://github.com/mattheworiordan/capybara-screenshot # SETH: ADDED TO FORCE OUR OWN DB LOADING require File.expand_path('../before_cucumber', __FILE__)