Merge branch 'improve-tests' into dev

Author: rayluo

tests/test_e2e.py

@@ -58,6 +58,12 @@ def assertLoosely(self, response, assertion=None,
 
     def assertCacheWorksForUser(
             self, result_from_wire, scope, username=None, data=None):
+        logger.debug(
+            "%s: cache = %s, id_token_claims = %s",
+            self.id(),
+            json.dumps(self.app.token_cache._cache, indent=4),
+            json.dumps(result_from_wire.get("id_token_claims"), indent=4),
+            )
         # You can filter by predefined username, or let end user to choose one
         accounts = self.app.get_accounts(username=username)
         self.assertNotEqual(0, len(accounts))
@@ -164,12 +170,6 @@ def _test_acquire_token_interactive(
     </ol></body></html>""".format(id=self.id(), username_uri=username_uri),
             data=data or {},
             )
-        logger.debug(
-            "%s: cache = %s, id_token_claims = %s",
-            self.id(),
-            json.dumps(self.app.token_cache._cache, indent=4),
-            json.dumps(result.get("id_token_claims"), indent=4),
-            )
         self.assertIn(
             "access_token", result,
             "{error}: {error_description}".format(
@@ -401,7 +401,10 @@ def tearDownClass(cls):
     def get_lab_app_object(cls, **query):  # https://msidlab.com/swagger/index.html
         url = "https://msidlab.com/api/app"
         resp = cls.session.get(url, params=query)
-        return resp.json()[0]
+        result = resp.json()[0]
+        result["scopes"] = [  # Raw data has extra space, such as "s1, s2"
+            s.strip() for s in result["defaultScopes"].split(',')]
+        return result
 
     @classmethod
     def get_lab_user_secret(cls, lab_name="msidlab4"):
@@ -698,7 +701,7 @@ def test_b2c_acquire_token_by_auth_code(self):
             authority=self._build_b2c_authority("B2C_1_SignInPolicy"),
             client_id=config["appId"],
             port=3843,  # Lab defines 4 of them: [3843, 4584, 4843, 60000]
-            scope=config["defaultScopes"].split(','),
+            scope=config["scopes"],
             )
 
     @unittest.skipIf(os.getenv("TRAVIS"), "Browser automation is not yet implemented")
@@ -708,7 +711,7 @@ def test_b2c_acquire_token_by_auth_code_flow(self):
             authority=self._build_b2c_authority("B2C_1_SignInPolicy"),
             client_id=config["appId"],
             port=3843,  # Lab defines 4 of them: [3843, 4584, 4843, 60000]
-            scope=config["defaultScopes"].split(','),
+            scope=config["scopes"],
             username_uri="https://msidlab.com/api/user?usertype=b2c&b2cprovider=local",
             )
 
@@ -719,7 +722,7 @@ def test_b2c_acquire_token_by_ropc(self):
             client_id=config["appId"],
             username="[email protected]",
             password=self.get_lab_user_secret("msidlabb2c"),
-            scope=config["defaultScopes"].split(','),
+            scope=config["scopes"],
             )