Download as
Browse Code »

Commit f1c5f4684eaae8153d960ad3e7c2446f5a6851a5

Authored by Daniel Cunha
1 parent 5729cb10
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

building url appropriately

Showing 1 changed file with 7 additions and 7 deletions   Show diff stats
lib/noosfero.rb
  Diff comments   View file @f1c5f46
@@ -79,14 +79,14 @@ module Noosfero @@ -79,14 +79,14 @@ module Noosfero
79 end 79 end
80 80
81 def self.url_options 81 def self.url_options
82 - if ENV['RAILS_ENV'] == 'development' 82 + case ENV['RAILS_ENV']
  83 + when 'development'
83 development_url_options 84 development_url_options
84 - elsif ENV['RAILS_ENV'] == 'cucumber'  
85 - { :host => Capybara.current_session.driver.rack_server.host,  
86 - :port => Capybara.current_session.driver.rack_server.port }  
87 - else  
88 - {}  
89 - end 85 + when 'cucumber'
  86 + if Capybara.current_driver == :selenium
  87 + { :host => Capybara.current_session.driver.rack_server.host, :port => Capybara.current_session.driver.rack_server.port }
  88 + end
  89 + end || { }
90 end 90 end
91 91
92 def self.development_url_options 92 def self.development_url_options