Download as
Browse Code »

Commit a5bac9a16ae8658297e5229082e1b6728c5dd023

Authored by Daniel Cunha
Committed by Daniela Feitosa
1 parent f8e94857
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

building url appropriately

Showing 1 changed file with 7 additions and 7 deletions   Show diff stats
lib/noosfero.rb
  Diff comments   View file @a5bac9a
@@ -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