From dc57cf59ec6818e49a92abad6ad81a982dbae1c1 Mon Sep 17 00:00:00 2001 From: Folker Bernitt Date: Wed, 27 Jan 2016 16:43:24 +0100 Subject: Disable CSP for phantomjs - disable only during phantomjs tests - CSP headers seem to prevent sendkey webdriver capability --- service/pixelated/config/site.py | 9 +++++++++ service/test/functional/features/environment.py | 2 ++ 2 files changed, 11 insertions(+) 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() -- cgit v1.2.3