Merge branch 'feature/generic-wizard' into develop

The generic wizard (big) branch is now stabilised.
A bunch of refactors have gone together with this topic branch:

- client does not have any info included for default service providers.
- user has to run the first-run wizard and manually entry domain for sample provider.
- remove all remains of the older branding strategy for default provider.
- srp registration + authentication are integrated with the signup process.

1 files changed, 5 insertions, 1 deletions

diff --git a/src/leap/gui/tests/integration/fake_user_signup.py b/src/leap/gui/tests/integration/fake_user_signup.py
index 12f18966..78873749 100644
--- a/src/leap/gui/tests/integration/fake_user_signup.py
+++ b/src/leap/gui/tests/integration/fake_user_signup.py
@@ -12,6 +12,7 @@ curl -d login=python_test_user -d password_salt=54321\
 from BaseHTTPServer import HTTPServer
 from BaseHTTPServer import BaseHTTPRequestHandler
 import cgi
+import json
 import urlparse
 
 HOST = "localhost"
@@ -19,12 +20,15 @@ PORT = 8000
 
 LOGIN_ERROR = """{"errors":{"login":["has already been taken"]}}"""
 
+from leap.base.tests.test_providers import EXPECTED_DEFAULT_CONFIG
+
 
 class request_handler(BaseHTTPRequestHandler):
     responses = {
         '/': ['ok\n'],
         '/users.json': ['ok\n'],
-        '/timeout': ['ok\n']
+        '/timeout': ['ok\n'],
+        '/provider.json': ['%s\n' % json.dumps(EXPECTED_DEFAULT_CONFIG)]
     }
 
     def do_GET(self):