summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFolker Bernitt <fbernitt@thoughtworks.com>2016-01-27 16:43:24 +0100
committerFolker Bernitt <fbernitt@thoughtworks.com>2016-01-27 16:43:24 +0100
commitdc57cf59ec6818e49a92abad6ad81a982dbae1c1 (patch)
treeeeac8e6537c960b745245bb1d0f053006b8f3028
parente66b356f900bc9899a5506378163ffaadd4a32b5 (diff)
Disable CSP for phantomjs
- disable only during phantomjs tests - CSP headers seem to prevent sendkey webdriver capability
-rw-r--r--service/pixelated/config/site.py9
-rw-r--r--service/test/functional/features/environment.py2
2 files changed, 11 insertions, 0 deletions
diff --git a/service/pixelated/config/site.py b/service/pixelated/config/site.py
index bd149914..3427c7f4 100644
--- a/service/pixelated/config/site.py
+++ b/service/pixelated/config/site.py
@@ -12,4 +12,13 @@ class AddCSPHeaderRequest(Request):
class PixelatedSite(Site):
+
requestFactory = AddCSPHeaderRequest
+
+ @classmethod
+ def enable_csp_requests(cls):
+ cls.requestFactory = Site.requestFactory
+
+ @classmethod
+ def disable_csp_requests(cls):
+ cls.requestFactory = AddCSPHeaderRequest
diff --git a/service/test/functional/features/environment.py b/service/test/functional/features/environment.py
index 847322ff..3f478def 100644
--- a/service/test/functional/features/environment.py
+++ b/service/test/functional/features/environment.py
@@ -21,6 +21,7 @@ from leap.common.events.server import ensure_server
from twisted.internet import defer
from pixelated.application import UserAgentMode
+from pixelated.config.site import PixelatedSite
from test.support.dispatcher.proxy import Proxy
from test.support.integration import AppTestClient
from selenium import webdriver
@@ -40,6 +41,7 @@ def start_app_test_client(client, mode):
def before_all(context):
ensure_server()
logging.disable('INFO')
+ PixelatedSite.disable_csp_requests()
client = AppTestClient()
start_app_test_client(client, UserAgentMode(is_single_user=True))
client.listenTCP()