refactor(test): load_fixture -> read_config_file

Less ambiguity

Author: tony

tests/fixtures/_util.py

@@ -3,7 +3,7 @@
 FIXTURE_PATH = pathlib.Path(__file__).parent
 
 
-def load_fixture(_file):  # return fixture data, relative to __file__
+def read_config_file(_file):  # return fixture data, relative to __file__
     return open(FIXTURE_PATH / _file).read()
 
 

tests/fixtures/config/expand2.py

@@ -1,8 +1,8 @@
 import os
 
-from .._util import load_fixture
+from .._util import read_config_file
 
-unexpanded_yaml = load_fixture("config/expand2-unexpanded.yaml")
-expanded_yaml = load_fixture("config/expand2-expanded.yaml").format(
+unexpanded_yaml = read_config_file("config/expand2-unexpanded.yaml")
+expanded_yaml = read_config_file("config/expand2-expanded.yaml").format(
     HOME=os.path.expanduser("~")
 )

tests/fixtures/config/shell_command_before_session.py

@@ -1,4 +1,4 @@
-from .._util import load_fixture
+from .._util import read_config_file
 
-before = load_fixture("config/shell_command_before_session.yaml")
-expected = load_fixture("config/shell_command_before_session-expected.yaml")
+before = read_config_file("config/shell_command_before_session.yaml")
+expected = read_config_file("config/shell_command_before_session-expected.yaml")

tests/fixtures/config_teamocil/layouts.py

@@ -1,6 +1,6 @@
-from .._util import load_fixture
+from .._util import read_config_file
 
-teamocil_yaml = load_fixture("config_teamocil/layouts.yaml")
+teamocil_yaml = read_config_file("config_teamocil/layouts.yaml")
 
 teamocil_dict = {
     "two-windows": {

tests/fixtures/config_teamocil/test1.py

@@ -1,6 +1,6 @@
-from .._util import load_fixture
+from .._util import read_config_file
 
-teamocil_yaml = load_fixture("config_teamocil/test1.yaml")
+teamocil_yaml = read_config_file("config_teamocil/test1.yaml")
 teamocil_conf = {
     "windows": [
         {

tests/fixtures/config_teamocil/test2.py

@@ -1,6 +1,6 @@
-from .._util import load_fixture
+from .._util import read_config_file
 
-teamocil_yaml = load_fixture("config_teamocil/test2.yaml")
+teamocil_yaml = read_config_file("config_teamocil/test2.yaml")
 teamocil_dict = {
     "windows": [
         {

tests/fixtures/config_teamocil/test3.py

@@ -1,6 +1,6 @@
-from .._util import load_fixture
+from .._util import read_config_file
 
-teamocil_yaml = load_fixture("config_teamocil/test3.yaml")
+teamocil_yaml = read_config_file("config_teamocil/test3.yaml")
 
 teamocil_dict = {
     "windows": [

tests/fixtures/config_teamocil/test4.py

@@ -1,6 +1,6 @@
-from .._util import load_fixture
+from .._util import read_config_file
 
-teamocil_yaml = load_fixture("config_teamocil/test4.yaml")
+teamocil_yaml = read_config_file("config_teamocil/test4.yaml")
 
 teamocil_dict = {
     "windows": [

tests/fixtures/config_tmuxinator/test1.py

@@ -1,6 +1,6 @@
-from .._util import load_fixture
+from .._util import read_config_file
 
-tmuxinator_yaml = load_fixture("config_tmuxinator/test1.yaml")
+tmuxinator_yaml = read_config_file("config_tmuxinator/test1.yaml")
 tmuxinator_dict = {
     "windows": [
         {"editor": {"layout": "main-vertical", "panes": ["vim", "guard"]}},

tests/fixtures/config_tmuxinator/test2.py

@@ -1,6 +1,6 @@
-from .._util import load_fixture
+from .._util import read_config_file
 
-tmuxinator_yaml = load_fixture("config_tmuxinator/test2.yaml")
+tmuxinator_yaml = read_config_file("config_tmuxinator/test2.yaml")
 
 tmuxinator_dict = {
     "project_name": "sample",

tests/fixtures/config_tmuxinator/test3.py

@@ -1,6 +1,6 @@
-from .._util import load_fixture
+from .._util import read_config_file
 
-tmuxinator_yaml = load_fixture("config_tmuxinator/test3.yaml")
+tmuxinator_yaml = read_config_file("config_tmuxinator/test3.yaml")
 
 tmuxinator_dict = {
     "name": "sample",

tests/test_cli.py

@@ -28,7 +28,7 @@
 )
 from tmuxp.workspacebuilder import WorkspaceBuilder
 
-from .fixtures._util import FIXTURE_PATH, load_fixture
+from .fixtures._util import FIXTURE_PATH, read_config_file
 
 
 def test_creates_config_dir_not_exists(tmp_path: pathlib.Path):
@@ -861,7 +861,7 @@ def test_help(cli_args, monkeypatch):
     ],
 )
 def test_import_teamocil(cli_args, inputs, tmp_path, monkeypatch):
-    teamocil_config = load_fixture("config_teamocil/test4.yaml")
+    teamocil_config = read_config_file("config_teamocil/test4.yaml")
 
     teamocil_path = tmp_path / ".teamocil"
     teamocil_path.mkdir()
@@ -900,7 +900,7 @@ def test_import_teamocil(cli_args, inputs, tmp_path, monkeypatch):
     ],
 )
 def test_import_tmuxinator(cli_args, inputs, tmp_path, monkeypatch):
-    tmuxinator_config = load_fixture("config_tmuxinator/test3.yaml")
+    tmuxinator_config = read_config_file("config_tmuxinator/test3.yaml")
 
     tmuxinator_path = tmp_path / ".tmuxinator"
     tmuxinator_path.mkdir()
@@ -1103,7 +1103,7 @@ def test_ls_cli(monkeypatch: pytest.MonkeyPatch, tmp_path: pathlib.Path):
 def test_load_plugins(monkeypatch_plugin_test_packages):
     from tmuxp_test_plugin_bwb.plugin import PluginBeforeWorkspaceBuilder
 
-    plugins_config = load_fixture("workspacebuilder/plugin_bwb.yaml")
+    plugins_config = read_config_file("workspacebuilder/plugin_bwb.yaml")
 
     sconfig = kaptan.Kaptan(handler="yaml")
     sconfig = sconfig.import_config(plugins_config).get()
@@ -1186,7 +1186,7 @@ def test_plugin_system_before_script(
 
 
 def test_reattach_plugins(monkeypatch_plugin_test_packages, server):
-    config_plugins = load_fixture("workspacebuilder/plugin_r.yaml")
+    config_plugins = read_config_file("workspacebuilder/plugin_r.yaml")
 
     sconfig = kaptan.Kaptan(handler="yaml")
     sconfig = sconfig.import_config(config_plugins).get()
@@ -1217,7 +1217,7 @@ def test_load_attached(server, monkeypatch):
 
     monkeypatch.setattr("libtmux.session.Session.attach_session", attach_session_mock)
 
-    yaml_config = load_fixture("workspacebuilder/two_pane.yaml")
+    yaml_config = read_config_file("workspacebuilder/two_pane.yaml")
     sconfig = kaptan.Kaptan(handler="yaml")
     sconfig = sconfig.import_config(yaml_config).get()
 
@@ -1237,7 +1237,7 @@ def test_load_attached_detached(server, monkeypatch):
 
     monkeypatch.setattr("libtmux.session.Session.attach_session", attach_session_mock)
 
-    yaml_config = load_fixture("workspacebuilder/two_pane.yaml")
+    yaml_config = read_config_file("workspacebuilder/two_pane.yaml")
     sconfig = kaptan.Kaptan(handler="yaml")
     sconfig = sconfig.import_config(yaml_config).get()
 
@@ -1257,7 +1257,7 @@ def test_load_attached_within_tmux(server, monkeypatch):
 
     monkeypatch.setattr("libtmux.session.Session.switch_client", switch_client_mock)
 
-    yaml_config = load_fixture("workspacebuilder/two_pane.yaml")
+    yaml_config = read_config_file("workspacebuilder/two_pane.yaml")
     sconfig = kaptan.Kaptan(handler="yaml")
     sconfig = sconfig.import_config(yaml_config).get()
 
@@ -1277,7 +1277,7 @@ def test_load_attached_within_tmux_detached(server, monkeypatch):
 
     monkeypatch.setattr("libtmux.session.Session.switch_client", switch_client_mock)
 
-    yaml_config = load_fixture("workspacebuilder/two_pane.yaml")
+    yaml_config = read_config_file("workspacebuilder/two_pane.yaml")
     sconfig = kaptan.Kaptan(handler="yaml")
     sconfig = sconfig.import_config(yaml_config).get()
 
@@ -1289,7 +1289,7 @@ def test_load_attached_within_tmux_detached(server, monkeypatch):
 
 
 def test_load_append_windows_to_current_session(server, monkeypatch):
-    yaml_config = load_fixture("workspacebuilder/two_pane.yaml")
+    yaml_config = read_config_file("workspacebuilder/two_pane.yaml")
     sconfig = kaptan.Kaptan(handler="yaml")
     sconfig = sconfig.import_config(yaml_config).get()