From 170ef67181446c7be95813420aec261c36fc8ec5 Mon Sep 17 00:00:00 2001 From: Raphael Date: Thu, 19 Aug 2010 16:43:56 -0700 Subject: [PATCH 1/2] set browser in selenium.yml for linux --- config/selenium.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/selenium.yml b/config/selenium.yml index 32bbc92fd..83ab2917f 100644 --- a/config/selenium.yml +++ b/config/selenium.yml @@ -7,7 +7,7 @@ local: &local test_framework: webrat selenium_server_address: "127.0.0.1" selenium_server_port: "4444" - selenium_browser_key: "*chrome /Applications/Firefox.app/Contents/MacOS/firefox-bin" + selenium_browser_key: "*chrome /usr/bin/firefox" application_address: "127.0.0.1" application_port: "4000" From 09ed7141ddd6dddc677b41d9812697f34aa8b0a8 Mon Sep 17 00:00:00 2001 From: Raphael Date: Thu, 19 Aug 2010 16:46:46 -0700 Subject: [PATCH 2/2] json --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 55ecc7a8b..9f9498361 100644 --- a/Gemfile +++ b/Gemfile @@ -22,6 +22,7 @@ gem 'will_paginate', '3.0.pre' #Uncatagorized gem 'roxml', :git => 'git://github.com/Empact/roxml.git' gem 'addressable', :require => 'addressable/uri' +gem 'json' #Standards gem 'pubsubhubbub' @@ -47,7 +48,6 @@ group :test do gem 'database_cleaner' gem 'saucelabs-adapter', '= 0.8.12' gem 'selenium-rc' - gem 'json' end group :development do