use TESTSPACE_TOKEN in push env (#3)

* use TESTSPACE_TOKEN in push env

Author: jaschultz

tests/test_testspace.py

@@ -1,34 +1,15 @@
 from testspace import testspace as ts
 
 
-def test_url_token():
+def test_url():
     token = "abcxyzfortesting"
     url = "abccorp.testspace.com"
     project = "abccorp:application"
     space = "master"
     protocol = "https"
 
-    client_url = "{}:@{}".format(token, url)
-    api_url = "{}://{}/api".format(protocol, url)
-
     testspace = ts.Testspace(token, url, project, space)
-    assert testspace.client_url == client_url
-    assert testspace.api_url == api_url
-
-
-def test_url_password():
-    token = "absmith:passfortesting"
-    url = "abccorp.testspace.com"
-    project = "abccorp:application"
-    space = "master"
-    protocol = "https"
-
-    client_url = "{}@{}".format(token, url)
-    api_url = "{}://{}/api".format(protocol, url)
-
-    testspace = ts.Testspace(token, url, project, space)
-    assert testspace.client_url == client_url
-    assert testspace.api_url == api_url
+    assert testspace.url == "{}://{}".format(protocol, url)
 
 
 def test_http():
@@ -38,10 +19,6 @@ def test_http():
     space = "master"
     protocol = "http"
 
-    client_url = "{}://{}:@{}".format(protocol, token, url)
-    api_url = "{}://{}/api".format(protocol, url)
-
     testspace_url = "{}://{}".format(protocol, url)
     testspace = ts.Testspace(token, testspace_url, project, space)
-    assert testspace.client_url == client_url
-    assert testspace.api_url == api_url
+    assert testspace.url == "{}://{}".format(protocol, url)

tests/test_testspace_api.py

@@ -31,10 +31,7 @@ def test_get_api_endpoints(load_json, testspace_api, requests_mock):
 
 @pytest.mark.parametrize("load_json", ["api_endpoints.json"], indirect=True)
 def test_get_api_endpoints_url_https(load_json, testspace_api, requests_mock):
-    url = "{}://{}".format("https", testspace_api.url)
-    testspace_url = "/".join([url, "api"])
-
-    testspace_api = ts.Testspace(testspace_api.token, url)
+    testspace_url = "/".join([testspace_api.url, "api"])
 
     requests_mock.get(testspace_url, json=load_json)
     response_json = testspace_api.get_api_endpoints()
@@ -68,8 +65,7 @@ def test_get_projects(load_json, testspace_api, requests_mock):
 
 @pytest.mark.parametrize("load_json", ["projects.json"], indirect=True)
 def test_get_projects_paginated(load_json, testspace_api, requests_mock):
-    url = testspace_api.url
-    testspace_url = "https://{}/api/projects".format(url)
+    testspace_url = "{}/api/projects".format(testspace_api.url)
 
     links_string_first = '<{}?page={}>; rel="{}"'.format(testspace_url, 1, "first")
     links_string_next = '<{}?page={}>; rel="{}"'.format(testspace_url, 2, "next")

tests/test_testspace_client.py

@@ -33,8 +33,7 @@ def test_push(mocker, testspace_client):
         message=message,
     )
 
-    url = "{}@{}/{}/{}?{}#{}".format(
-        testspace_client.token,
+    url = "{}/{}/{}?{}#{}".format(
         testspace_client.url,
         testspace_client.project,
         testspace_client.space,

testspace/testspace.py

@@ -1,10 +1,10 @@
+import os
 import requests
 import subprocess
 
 
 class Testspace:
     def __init__(self, token, url, project=None, space=None, verify=True):
-        self.url = url
         self.project = project
         self.space = space
         self.verify = verify
@@ -13,15 +13,11 @@ def __init__(self, token, url, project=None, space=None, verify=True):
         if ":" not in token:
             self.token = "{}:".format(token)
 
-        split_url = self.url.split("://")
+        split_url = url.split("://")
         if len(split_url) > 1 and split_url[0] in ["http", "https"]:
-            self.client_url = "{}://{}@{}".format(
-                split_url[0], self.token, split_url[1]
-            )
-            self.api_url = "/".join([self.url, "api"])
+            self.url = url
         else:
-            self.client_url = "{}@{}".format(self.token, self.url)
-            self.api_url = "/".join(["{}://{}".format("https", self.url), "api"])
+            self.url = "{}://{}".format("https", url)
 
     def push(
         self,
@@ -49,7 +45,7 @@ def push(
         if file is not None:
             command_args_list.append(file)
 
-        full_client_url = "/".join([self.client_url, project, space])
+        full_client_url = "/".join([self.url, project, space])
 
         if how is not None:
             if how not in ["full", "start", "add", "finish"]:
@@ -68,7 +64,11 @@ def push(
         if message is not None:
             command_args_list.append("--message={}".format(message))
 
-        subprocess.run(command_args_list, check=True)
+        subprocess.run(
+            command_args_list,
+            check=True,
+            env=dict(os.environ, TESTSPACE_TOKEN=self.token),
+        )
 
     def get_api_endpoints(self):
         return self.get_request_json()
@@ -205,7 +205,7 @@ def delete_request(self, path=None):
         return response
 
     def get_api_url(self):
-        return self.api_url
+        return "/".join([self.url, "api"])
 
     def get_projects_path(self):
         return "projects"