Building url for selenium driver

Daniel Cunha · Daniela Feitosa
1 parent e4defc23
Showing 2 changed files with 7 additions and 8 deletions Show diff stats
app/models/environment.rb
lib/noosfero.rb
@@ -616,12 +616,10 @@ class Environment &lt; ActiveRecord::Base
   end
   def top_url
-    protocol = 'http'
-    result = "#{protocol}://#{default_hostname}"
-    if Noosfero.url_options.has_key?(:port)
-      result << ':' << Noosfero.url_options[:port].to_s
-    end
-    result
+    url = 'http://'
+    url << (Noosfero.url_options.key?(:host) ? Noosfero.url_options[:host] : default_hostname)
+    url << ':' << Noosfero.url_options[:port].to_s if Noosfero.url_options.key?(:port)
+    url
   end
   def to_s
@@ -81,8 +81,9 @@ module Noosfero
   def self.url_options
     if ENV['RAILS_ENV'] == 'development'
       development_url_options
-    # elsif ENV['RAILS_ENV'] == 'cucumber'
-    #   Webrat.configuration.mode == :rails ? { :host => '' } : { :port => Webrat.configuration.application_port }
+    elsif ENV['RAILS_ENV'] == 'cucumber'
+      { :host => Capybara.current_session.driver.rack_server.host,
+        :port => Capybara.current_session.driver.rack_server.port }
     else
       {}
     end