Fix tests

Author: jimporter

test/__init__.py

@@ -1,4 +1,5 @@
 import os
+import re
 import shutil
 import subprocess
 import tempfile
@@ -8,7 +9,7 @@
 
 __all__ = ['this_dir', 'test_data_dir', 'test_stage_dir', 'stage_dir', 'pushd',
            'copytree', 'check_call_silent', 'check_output', 'git_config',
-           'git_init', 'commit_files', 'assertDirectory']
+           'git_init', 'commit_files', 'match_redir', 'assertDirectory']
 
 this_dir = os.path.abspath(os.path.dirname(__file__))
 test_data_dir = os.path.join(this_dir, 'data')
@@ -115,6 +116,10 @@ def relpaths(paths, base):
     return [os.path.relpath(i, base) for i in paths]
 
 
+def match_redir(url):
+    return r'window\.location\.replace\("{}"'.format(re.escape(url))
+
+
 def assertDirectory(path, contents, include_hidden=False, allow_extra=False):
     path = os.path.normpath(path)
     actual = set(os.path.normpath(os.path.join(base, f))

test/integration/test_alias.py

@@ -1,16 +1,11 @@
 import os
-import re
 import unittest
 
 from . import assertPopen, assertOutput
 from .. import *
 from mike import git_utils, versions
 
 
-def match_redir(url):
-    return r'window\.location\.replace\("{}"\)'.format(re.escape(url))
-
-
 class AliasTestCase(unittest.TestCase):
     def _deploy(self, branch=None, versions=['1.0'], prefix=''):
         extra_args = ['-b', branch] if branch else []

test/integration/test_deploy.py

@@ -1,16 +1,11 @@
 import os
-import re
 import unittest
 
 from . import assertPopen, assertOutput
 from .. import *
 from mike import git_utils, versions
 
 
-def match_redir(url):
-    return r'window\.location\.replace\("{}"\)'.format(re.escape(url))
-
-
 class DeployTestCase(unittest.TestCase):
     def _test_deploy(self, expected_message=None,
                      expected_versions=[versions.VersionInfo('1.0')],

test/integration/test_set_default.py

@@ -14,8 +14,8 @@ def _deploy(self, branch=None, versions=['1.0'], prefix=''):
         for i in versions:
             assertPopen(['mike', 'deploy', i] + extra_args)
 
-    def _test_default(self, expr=r'window\.location\.replace\("1\.0/"\)',
-                      expected_message=None, directory='.'):
+    def _test_default(self, expr=match_redir('1.0/'), expected_message=None,
+                      directory='.'):
         message = assertPopen(['git', 'log', '-1', '--pretty=%B']).rstrip()
         if expected_message:
             self.assertEqual(message, expected_message)

test/unit/test_commands.py

@@ -10,10 +10,6 @@
 from mike import commands, git_utils, versions
 
 
-def match_redir(url):
-    return r'window\.location\.replace\("{}"\)'.format(re.escape(url))
-
-
 class MockConfig:
     def __init__(self, site_dir, remote_name='origin',
                  remote_branch='gh-pages', use_directory_urls=True):
@@ -539,8 +535,8 @@ def _deploy(self, branch='gh-pages', prefix=''):
         with commands.deploy(self.cfg, '1.0', branch=branch, prefix=prefix):
             pass
 
-    def _test_default(self, expr=r'window\.location\.replace\("1\.0/"\)',
-                      expected_message=None, directory='.'):
+    def _test_default(self, expr=match_redir('1.0/'), expected_message=None,
+                      directory='.'):
         message = check_output(['git', 'log', '-1', '--pretty=%B']).rstrip()
         if expected_message:
             self.assertEqual(message, expected_message)