From f1c5f4684eaae8153d960ad3e7c2446f5a6851a5 Mon Sep 17 00:00:00 2001 From: Daniel Cunha Date: Fri, 7 Dec 2012 08:35:39 -0300 Subject: [PATCH] building url appropriately --- lib/noosfero.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/noosfero.rb b/lib/noosfero.rb index f9da394..86c4191 100644 --- a/lib/noosfero.rb +++ b/lib/noosfero.rb @@ -79,14 +79,14 @@ module Noosfero end def self.url_options - if ENV['RAILS_ENV'] == 'development' + case ENV['RAILS_ENV'] + when 'development' development_url_options - elsif ENV['RAILS_ENV'] == 'cucumber' - { :host => Capybara.current_session.driver.rack_server.host, - :port => Capybara.current_session.driver.rack_server.port } - else - {} - end + when 'cucumber' + if Capybara.current_driver == :selenium + { :host => Capybara.current_session.driver.rack_server.host, :port => Capybara.current_session.driver.rack_server.port } + end + end || { } end def self.development_url_options -- libgit2 0.21.2