Windows compatibility: remove colons from test filenames, closes #1304

ThinkUpLLC · May 1, 2012 · 20ac38c · 20ac38c
1 parent 21a971b
commit 20ac38c
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 0 deletions.
diff --git a/webapp/plugins/googleplus/tests/classes/mock.GooglePlusAPIAccessor.php b/webapp/plugins/googleplus/tests/classes/mock.GooglePlusAPIAccessor.php
@@ -54,6 +54,7 @@ public function apiRequest($path, $access_token, $fields=null) {
         }
         $FAUX_DATA_PATH = THINKUP_ROOT_PATH . $this->data_location;
         $url = str_replace($this->api_domain, '', $url);
+        $url = str_replace(':', '', $url);
         $url = str_replace('/', '_', $url);
         $url = str_replace('&', '-', $url);
         $url = str_replace('?', '-', $url);
@@ -112,6 +113,7 @@ private function rawApiRequest($path, $decode_json=true) {
         $url = preg_replace('/([\?\&])access_token\=[^\?\&]+([\?\&])*/', "$1", $url);
         $url = preg_replace('/[\?\&]$/', '', $url);
         $url = str_replace($this->api_domain, '', $url);
+        $url = str_replace(':', '', $url);
         $url = str_replace('/', '_', $url);
         $url = str_replace('&', '-', $url);
         $url = str_replace('?', '-', $url);

diff --git a/...hinkup.com%2Faccount%2F%3Fp%3Dgoogle%252B → ...hinkup.com%2Faccount%2F%3Fp%3Dgoogle%252B b/...hinkup.com%2Faccount%2F%3Fp%3Dgoogle%252B → ...hinkup.com%2Faccount%2F%3Fp%3Dgoogle%252B
diff --git a/...hinkup.com%2Faccount%2F%3Fp%3Dgoogle%252B → ...hinkup.com%2Faccount%2F%3Fp%3Dgoogle%252B b/...hinkup.com%2Faccount%2F%3Fp%3Dgoogle%252B → ...hinkup.com%2Faccount%2F%3Fp%3Dgoogle%252B
diff --git a/...hinkup.com%2Faccount%2F%3Fp%3Dgoogle%252B → ...hinkup.com%2Faccount%2F%3Fp%3Dgoogle%252B b/...hinkup.com%2Faccount%2F%3Fp%3Dgoogle%252B → ...hinkup.com%2Faccount%2F%3Fp%3Dgoogle%252B
diff --git a/...t_type=authorization_code-code=test-code1 → ...t_type=authorization_code-code=test-code1 b/...t_type=authorization_code-code=test-code1 → ...t_type=authorization_code-code=test-code1
diff --git a/...hinkup.com%2Faccount%2F%3Fp%3Dgoogle%252B → ...hinkup.com%2Faccount%2F%3Fp%3Dgoogle%252B b/...hinkup.com%2Faccount%2F%3Fp%3Dgoogle%252B → ...hinkup.com%2Faccount%2F%3Fp%3Dgoogle%252B
diff --git a/...hinkup.com%2Faccount%2F%3Fp%3Dgoogle%252B → ...hinkup.com%2Faccount%2F%3Fp%3Dgoogle%252B b/...hinkup.com%2Faccount%2F%3Fp%3Dgoogle%252B → ...hinkup.com%2Faccount%2F%3Fp%3Dgoogle%252B
diff --git a/...h_token-refresh_token=test-refresh_token1 → ...h_token-refresh_token=test-refresh_token1 b/...h_token-refresh_token=test-refresh_token1 → ...h_token-refresh_token=test-refresh_token1
diff --git a/...sh_token-refresh_token=test_refresh_token → ...sh_token-refresh_token=test_refresh_token b/...sh_token-refresh_token=test_refresh_token → ...sh_token-refresh_token=test_refresh_token