3 files changed, 80 insertions, 77 deletions
diff --git a/tests/test_cli.py b/tests/test_cli.py
new file mode 100644
index 0000000..f531989
--- /dev/null
+++ b/tests/test_cli.py
@@ -0,0 +1,18 @@
+from dotfiles.cli import cli
+from dotfiles.repository import Repository
+
+
+class TestCli(object):
+
+    def test_status(self, runner, repo, home, monkeypatch):
+
+        def repo_init(self, *args, **kwargs):
+            self.ignore = []
+            self.homedir = home
+            self.repodir = repo.ensure(dir=1)
+
+        monkeypatch.setattr(Repository, '__init__', repo_init)
+
+        result = runner.invoke(cli, ['status'])
+        assert not result.exception
+        assert result.output == ''
diff --git a/tests/test_dotfiles.py b/tests/test_dotfile.py
index 8323385..0e09654 100644
--- a/tests/test_dotfiles.py
+++ b/tests/test_dotfile.py
@@ -1,86 +1,9 @@
 import pytest
 
-from dotfiles.cli import cli
 from dotfiles.dotfile import Dotfile
-from dotfiles.repository import Repository
 from dotfiles.exceptions import IsSymlink
 
 
-class TestCli(object):
-
-    def test_status(self, runner, repo, home, monkeypatch):
-
-        def repo_init(self, *args, **kwargs):
-            self.ignore = []
-            self.homedir = home
-            self.repodir = repo.ensure(dir=1)
-
-        monkeypatch.setattr(Repository, '__init__', repo_init)
-
-        result = runner.invoke(cli, ['status'])
-        assert not result.exception
-        assert result.output == ''
-
-
-class TestRepository(object):
-
-    def test_init(self, repo, home):
-        repo.remove()
-        assert repo.check(exists=0)
-
-        r = Repository(repo, home)
-        assert r.repodir == repo
-        assert r.homedir == home
-        assert repo.check(exists=1, dir=1)
-
-    def test_str(self, repo, home):
-        repo.ensure('a')
-        repo.ensure('b')
-        repo.ensure('c')
-        assert str(Repository(repo, home)) == ('.a\n'
-                                               '.b\n'
-                                               '.c')
-
-    def test_repr(self, repo):
-        actual = '%r' % Repository(repo, None)
-        expected = '<Repository local(\'%s\')>' % repo
-        assert actual == expected
-
-    def test_target_to_name(self, repo, home):
-        actual = Repository(repo, home)._target_to_name(repo.join('foo'))
-        expected = home.join('.foo')
-        assert actual == expected
-
-    def test_name_to_target(self, repo, home):
-        actual = Repository(repo, home)._name_to_target(home.join('.foo'))
-        expected = repo.join('foo')
-        assert actual == expected
-
-    @pytest.mark.xfail(reason='TODO')
-    def test_dotifle(self):
-        assert False
-
-    def test_contents(self, repo, home):
-
-        assert Repository(repo, home).contents() == []
-
-        target_a = repo.ensure('a')
-        target_b = repo.ensure('b')
-        target_c = repo.ensure('c')
-        contents = Repository(repo, home).contents()
-
-        assert contents[0].target == target_a
-        assert contents[1].target == target_b
-        assert contents[2].target == target_c
-
-    def test_nested_name_to_target(self, repo, home):
-        r = Repository(repo, home)
-
-        actual = r._name_to_target(home.join('.vim/.mrconfig'))
-        expected = repo.join('vim/.mrconfig')
-        assert actual == expected
-
-
 class TestDotfile(object):
 
     def test_state_error(self, repo, home):
diff --git a/tests/test_repository.py b/tests/test_repository.py
new file mode 100644
index 0000000..591dee9
--- /dev/null
+++ b/tests/test_repository.py
@@ -0,0 +1,62 @@
+import pytest
+
+from dotfiles.repository import Repository
+
+
+class TestRepository(object):
+
+    def test_init(self, repo, home):
+        repo.remove()
+        assert repo.check(exists=0)
+
+        r = Repository(repo, home)
+        assert r.repodir == repo
+        assert r.homedir == home
+        assert repo.check(exists=1, dir=1)
+
+    def test_str(self, repo, home):
+        repo.ensure('a')
+        repo.ensure('b')
+        repo.ensure('c')
+        assert str(Repository(repo, home)) == ('.a\n'
+                                               '.b\n'
+                                               '.c')
+
+    def test_repr(self, repo):
+        actual = '%r' % Repository(repo, None)
+        expected = '<Repository local(\'%s\')>' % repo
+        assert actual == expected
+
+    def test_target_to_name(self, repo, home):
+        actual = Repository(repo, home)._target_to_name(repo.join('foo'))
+        expected = home.join('.foo')
+        assert actual == expected
+
+    def test_name_to_target(self, repo, home):
+        actual = Repository(repo, home)._name_to_target(home.join('.foo'))
+        expected = repo.join('foo')
+        assert actual == expected
+
+    @pytest.mark.xfail(reason='TODO')
+    def test_dotifle(self):
+        assert False
+
+    def test_contents(self, repo, home):
+
+        assert Repository(repo, home).contents() == []
+
+        target_a = repo.ensure('a')
+        target_b = repo.ensure('b')
+        target_c = repo.ensure('c')
+        contents = Repository(repo, home).contents()
+
+        assert contents[0].target == target_a
+        assert contents[1].target == target_b
+        assert contents[2].target == target_c
+
+    def test_nested_name_to_target(self, repo, home):
+        r = Repository(repo, home)
+
+        actual = r._name_to_target(home.join('.vim/.mrconfig'))
+        expected = repo.join('vim/.mrconfig')
+        assert actual == expected