tmuxinator tests to py.test parametrized funcs

tmux-python · May 22, 2016 · 781129b · 781129b
1 parent 795df2e
commit 781129b
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 70 deletions.
diff --git a/tests/fixtures/config_tmuxinator/test1.py b/tests/fixtures/config_tmuxinator/test1.py
@@ -22,7 +22,7 @@
     ]
 }
 
-tmuxp_dict = {
+expected = {
     'session_name': None,
     'windows': [
         {

diff --git a/tests/fixtures/config_tmuxinator/test2.py b/tests/fixtures/config_tmuxinator/test2.py
@@ -50,7 +50,7 @@
     ]
 }
 
-tmuxp_dict = {
+expected = {
     'session_name': 'sample',
     'socket_name': 'foo',
     'config': '~/.tmux.mac.conf',

diff --git a/tests/fixtures/config_tmuxinator/test3.py b/tests/fixtures/config_tmuxinator/test3.py
@@ -55,7 +55,7 @@
     ]
 }
 
-tmuxp_dict = {
+expected = {
     'session_name': 'sample',
     'socket_name': 'foo',
     'config': '~/.tmux.mac.conf',

diff --git a/tests/test_config_tmuxinator.py b/tests/test_config_tmuxinator.py
@@ -8,79 +8,34 @@
 import os
 
 import kaptan
+import pytest
 
 from tmuxp import config
 
 from .fixtures import config_tmuxinator as fixtures
-from .helpers import TestCase
 
 logger = logging.getLogger(__name__)
 TMUXP_DIR = os.path.join(os.path.dirname(__file__), '.tmuxp')
 
 
-class TmuxinatorTest(TestCase):
-
-    tmuxinator_yaml = fixtures.test1.tmuxinator_yaml
-    tmuxinator_dict = fixtures.test1.tmuxinator_dict
-    tmuxp_dict = fixtures.test1.tmuxp_dict
-
-    def test_config_to_dict(self):
-        configparser = kaptan.Kaptan(handler='yaml')
-        test_config = configparser.import_config(self.tmuxinator_yaml)
-        yaml_to_dict = test_config.get()
-        assert yaml_to_dict == self.tmuxinator_dict
-
-        assert config.import_tmuxinator(self.tmuxinator_dict) == \
-            self.tmuxp_dict
-
-
-class TmuxinatorDeprecationsTest(TestCase):
-
-    """Tmuxinator uses `tabs` instead of `windows` in older versions.
-
-    https://github.com/aziz/tmuxinator/blob/master/lib/tmuxinator/project.rb#L18
-
-    https://github.com/aziz/tmuxinator/blob/master/spec/fixtures/sample.deprecations.yml
-
-    LICENSE: https://github.com/aziz/tmuxinator/blob/master/LICENSE
-
-    """
-
-    tmuxinator_yaml = fixtures.test2.tmuxinator_yaml
-    tmuxinator_dict = fixtures.test2.tmuxinator_dict
-    tmuxp_dict = fixtures.test2.tmuxp_dict
-
-    def test_config_to_dict(self):
-        self.maxDiff = None
-        configparser = kaptan.Kaptan(handler='yaml')
-        test_config = configparser.import_config(self.tmuxinator_yaml)
-        yaml_to_dict = test_config.get()
-        assert yaml_to_dict == self.tmuxinator_dict
-
-        assert config.import_tmuxinator(self.tmuxinator_dict) == \
-            self.tmuxp_dict
-
-
-class TmuxinatoriSampleTest(TestCase):
-
-    """Test importing <spec/fixtures/sample.yml>.
-
-    https://github.com/aziz/tmuxinator/blob/master/spec/fixtures/sample.yml
-
-    LICENSE: https://github.com/aziz/tmuxinator/blob/master/LICENSE
-
-    """
-
-    tmuxinator_yaml = fixtures.test3.tmuxinator_yaml
-    tmuxinator_dict = fixtures.test3.tmuxinator_dict
-    tmuxp_dict = fixtures.test3.tmuxp_dict
-
-    def test_config_to_dict(self):
-        self.maxDiff = None
-        configparser = kaptan.Kaptan(handler='yaml')
-        test_config = configparser.import_config(self.tmuxinator_yaml)
-        yaml_to_dict = test_config.get()
-        assert yaml_to_dict == self.tmuxinator_dict
-
-        assert config.import_tmuxinator(self.tmuxinator_dict) == \
-            self.tmuxp_dict
+@pytest.mark.parametrize("tmuxinator_yaml,tmuxinator_dict,tmuxp_dict", [
+    (fixtures.test1.tmuxinator_yaml, fixtures.test1.tmuxinator_dict,
+     fixtures.test1.expected),
+    (fixtures.test2.tmuxinator_yaml, fixtures.test2.tmuxinator_dict,
+     fixtures.test2.expected),  # older vers use `tabs` instead of `windows`
+    (fixtures.test3.tmuxinator_yaml, fixtures.test3.tmuxinator_dict,
+     fixtures.test3.expected),  # Test importing <spec/fixtures/sample.yml>
+])
+def test_config_to_dict(tmuxinator_yaml, tmuxinator_dict, tmuxp_dict):
+    configparser = kaptan.Kaptan(handler='yaml')
+    test_config = configparser.import_config(tmuxinator_yaml)
+    yaml_to_dict = test_config.get()
+    assert yaml_to_dict == tmuxinator_dict
+
+    assert config.import_tmuxinator(tmuxinator_dict) == tmuxp_dict
+
+    config.validate_schema(
+        config.import_tmuxinator(
+            tmuxinator_dict
+        )
+    )