Merge branch '18947-githttpd'

[arvados.git] / apps / workbench / test / integration_helper.rb

diff --git a/apps/workbench/test/integration_helper.rb b/apps/workbench/test/integration_helper.rb
index 34ee1f479a6a2a9a9eacd8402d79dd343bbaf08a..7209f2b6c968f0285d0a71d8df4a2c22777068ef 100644 (file)
--- a/apps/workbench/test/integration_helper.rb
+++ b/apps/workbench/test/integration_helper.rb
@@ -156,19 +156,6 @@ module HeadlessHelper
   end
 end
 
-module KeepWebConfig
-  def getport service
-    File.read(File.expand_path("../../../../tmp/#{service}.port", __FILE__))
-  end
-
-  def use_keep_web_config
-    @kwport = getport 'keep-web-ssl'
-    @kwdport = getport 'keep-web-dl-ssl'
-    Rails.configuration.Services.WebDAV.ExternalURL = URI("https://localhost:#{@kwport}")
-    Rails.configuration.Services.WebDAVDownload.ExternalURL = URI("https://localhost:#{@kwdport}")
-  end
-end
-
 class ActionDispatch::IntegrationTest
   # Make the Capybara DSL available in all integration tests
   include Capybara::DSL
@@ -219,7 +206,7 @@ class ActionDispatch::IntegrationTest
   end
 
   teardown do
-    if not passed?
+    if !passed? && !skipped?
       screenshot
     end
     if Capybara.current_driver == :selenium