Merge lp:~vila/ols-store-tests/new-dashboard-doamin into lp:~ubuntuone-pqm-team/ols-store-tests/store-acceptance-tests

[Vincent Ladeuil]

Use the new dashboard.staging.snapcraft.io domain.

Use the new dashboard.staging.snapcraft.io domain.

The tests are useful to test the redirections so there are still pointed at myapps.developer.staging.ubuntu.com

[Shawn Wang (shawn111)]

+1

review: Approve

=== modified file 'tests/api/snap/test_register_name.py'
--- tests/api/snap/test_register_name.py	2017-03-17 11:05:37 +0000
+++ tests/api/snap/test_register_name.py	2017-03-27 07:47:26 +0000
@@ -95,24 +95,26 @@
         }
         self.assertEqual(body, expected)
 
+    def get_register_name_url(self, name):
+        # FIXME: Until the switch to dashboard.staging.snapcraft.io is
+        # complete, we won't use it for SCA_ROOT_URL so the redirections are
+        # still tested. -- vila 2017-03-27
+        TEMP_SCA_ROOT_URL = 'https://dashboard.staging.snapcraft.io'
+        register_name_url = (
+            '{}/dev/click-apps/register-name/'
+            '?series=16&name={}'.format(TEMP_SCA_ROOT_URL, name))
+        return register_name_url
+
     def assert_already_registered(self, response, name):
         self.assertEqual(response.status_code, 409)
         body = response.json()
-        # FIXME: https://scasnap.ols.staging.internal is self-signed so we
-        # can't use it directly as SCA_ROOT_URL. Once it gets a proper domain,
-        # that will become the target for the tests (avoiding the redirection
-        # issues) -- vila 2017-03-17
-        TEMP_SCA_ROOT_URL = 'https://scasnap.ols.staging.internal'
-        register_name_url = (
-            '{}/dev/click-apps/register-name/'
-            '?series=16&name={}'.format(TEMP_SCA_ROOT_URL, name))
         expected = {
             'status': 409,
             'code': 'already_registered',
             'title': 'Name already registered.',
             'detail': "'%s' is already registered." % name,
             'suggested_snap_name': '{}-{}'.format(TEST_USER_NAMESPACE, name),
-            'register_name_url': register_name_url,
+            'register_name_url': self.get_register_name_url(name),
             'type': 'devportal:v1:name-already-registered',
             'error_list': [{
                 'code': 'already_registered',
@@ -124,21 +126,13 @@
     def assert_reserved_name(self, response, name):
         self.assertEqual(response.status_code, 409)
         body = response.json()
-        # FIXME: https://scasnap.ols.staging.internal is self-signed so we
-        # can't use it directly as SCA_ROOT_URL. Once it gets a proper domain,
-        # that will become the target for the tests (avoiding the redirection
-        # issues) -- vila 2017-03-17
-        TEMP_SCA_ROOT_URL = 'https://scasnap.ols.staging.internal'
-        register_name_url = (
-            '{}/dev/click-apps/register-name/'
-            '?series=16&name={}'.format(TEMP_SCA_ROOT_URL, name))
         expected = {
             'status': 409,
             'code': 'reserved_name',
             'title': 'Name is reserved.',
             'detail': "'%s' is a reserved name." % name,
             'suggested_snap_name': '{}-{}'.format(TEST_USER_NAMESPACE, name),
-            'register_name_url': register_name_url,
+            'register_name_url': self.get_register_name_url(name),
             'type': 'devportal:v1:name-reserved',
             'error_list': [{
                 'code': 'reserved_name',