Download as
Browse Code »

Commit 26e34d90de9e44feec5599dee3015671a4ef62c5

Authored by Daniel Cunha
Committed by Daniela Feitosa
1 parent e4defc23
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

Building url for selenium driver

Showing 2 changed files with 7 additions and 8 deletions   Show diff stats
app/models/environment.rb
  Diff comments   View file @26e34d9
... ... @@ -616,12 +616,10 @@ class Environment < ActiveRecord::Base
616 616 end
617 617  
618 618 def top_url
619   - protocol = 'http'
620   - result = "#{protocol}://#{default_hostname}"
621   - if Noosfero.url_options.has_key?(:port)
622   - result << ':' << Noosfero.url_options[:port].to_s
623   - end
624   - result
  619 + url = 'http://'
  620 + url << (Noosfero.url_options.key?(:host) ? Noosfero.url_options[:host] : default_hostname)
  621 + url << ':' << Noosfero.url_options[:port].to_s if Noosfero.url_options.key?(:port)
  622 + url
625 623 end
626 624  
627 625 def to_s
... ...
lib/noosfero.rb
  Diff comments   View file @26e34d9
... ... @@ -81,8 +81,9 @@ module Noosfero
81 81 def self.url_options
82 82 if ENV['RAILS_ENV'] == 'development'
83 83 development_url_options
84   - # elsif ENV['RAILS_ENV'] == 'cucumber'
85   - # Webrat.configuration.mode == :rails ? { :host => '' } : { :port => Webrat.configuration.application_port }
  84 + elsif ENV['RAILS_ENV'] == 'cucumber'
  85 + { :host => Capybara.current_session.driver.rack_server.host,
  86 + :port => Capybara.current_session.driver.rack_server.port }
86 87 else
87 88 {}
88 89 end
... ...