Download as
Browse Code »

Commit 643a7bfab340f7af30de44cf5e3f9af2cabc346c

Authored by Daniel Cunha
1 parent 57ba1670
Exists in master and in 22 other branches angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis

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 @643a7bf
... ... @@ -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 @643a7bf
... ... @@ -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
... ...