finished the tests

Author: joseph-flinn

tests/fixtures/pluginsystem/plugins/tmuxp_test_plugin_awf/tmuxp_test_plugin_awf/plugin.py

@@ -6,4 +6,12 @@ def __init__(self):
 
     def after_window_finished(self, window):  
         if window.name == 'editor': 
-            window.rename_window('plugin_test_awf')
+            window.rename_window('plugin_test_awf')
+        elif window.name == 'awf_mw_test':
+            window.rename_window('plugin_test_awf_mw')
+        elif window.name == 'awf_mw_test_2':
+            window.rename_window('plugin_test_awf_mw_2')
+        elif window.name == 'mp_test_owc':
+            window.rename_window('mp_test_awf')
+        else:
+            pass

tests/fixtures/pluginsystem/plugins/tmuxp_test_plugin_bs/tmuxp_test_plugin_bs/plugin.py

@@ -5,5 +5,4 @@ def __init__(self):
         self.message = f'[+] This is the Tmuxp Test Plugin'
 
     def before_script(self, session):
-        print('Changing session_name to plugin_test_bs')
         session.rename_session('plugin_test_bs')

tests/fixtures/pluginsystem/plugins/tmuxp_test_plugin_owc/tmuxp_test_plugin_owc/plugin.py

@@ -6,4 +6,14 @@ def __init__(self):
 
     def on_window_create(self, window):
         if window.name == 'editor': 
-            window.rename_window('plugin_test_owc')
+            window.rename_window('plugin_test_owc')
+        elif window.name == 'owc_mw_test':
+            window.rename_window('plugin_test_owc_mw')
+        elif window.name == 'owc_mw_test_2':
+            window.rename_window('plugin_test_owc_mw_2')
+        elif window.name == 'mp_test':
+            window.rename_window('mp_test_owc')
+        else:
+            pass
+
+        

tests/fixtures/workspacebuilder/plugin_awf_multiple_windows.yaml

@@ -0,0 +1,18 @@
+session_name: plugin-test-awf-mw
+plugins:
+- 'tmuxp_test_plugin_awf.plugin.PluginAfterWindowFinished'
+windows:
+- window_name: awf_mw_test
+  layout: tiled
+  shell_command_before:
+    - cd ~/
+  panes:
+    - shell_command:
+        - cd /var/log
+        - ls -al | grep \.log
+- window_name: awf_mw_test_2
+  layout: tiled
+  shell_command_before:
+    - cd ~/
+  panes:
+    - echo hello

tests/fixtures/workspacebuilder/plugin_multiple_plugins.yaml

@@ -0,0 +1,15 @@
+session_name: plugin-test-multiple-plugins
+plugins:
+- 'tmuxp_test_plugin_bwb.plugin.PluginBeforeWorkspaceBuilder'
+- 'tmuxp_test_plugin_bs.plugin.PluginBeforeScript'
+- 'tmuxp_test_plugin_owc.plugin.PluginOnWindowCreate'
+- 'tmuxp_test_plugin_awf.plugin.PluginAfterWindowFinished'
+windows:
+- window_name: mp_test
+  layout: tiled
+  shell_command_before:
+    - cd ~/
+  panes:
+    - shell_command:
+        - cd /var/log
+        - ls -al | grep \.log

tests/fixtures/workspacebuilder/plugin_owc_multiple_windows.yaml

@@ -0,0 +1,17 @@
+session_name: plugin-test-owc-mw
+plugins:
+- 'tmuxp_test_plugin_owc.plugin.PluginOnWindowCreate'
+windows:
+- window_name: owc_mw_test
+  shell_command_before:
+    - cd ~/
+  panes:
+    - shell_command:
+        - cd /var/log
+        - ls -al | grep \.log
+- window_name: owc_mw_test_2
+  layout: tiled
+  shell_command_before:
+    - cd ~/
+  panes:
+    - echo hello

tests/test_cli.py

@@ -975,7 +975,6 @@ def test_reattach_plugins(server):
     except libtmux.exc.LibTmuxException as error:
         pass
 
-
     proc = builder.session.cmd('display-message', '-p', "'#S'") 
 
     assert proc.stdout[0] == "'plugin_test_r'"

tests/test_workspacebuilder.py

@@ -707,7 +707,6 @@ def test_plugin_system_before_workspace_builder(session):
     builder.build(session=session)
 
     proc = session.cmd('display-message', '-p', "'#S'") 
-    
     assert proc.stdout[0] == "'plugin_test_bwb'"
 
 
@@ -724,7 +723,6 @@ def test_plugin_system_before_script(session):
     builder.build(session=session)
 
     proc = session.cmd('display-message', '-p', "'#S'") 
-    
     assert proc.stdout[0] == "'plugin_test_bs'"
 
 
@@ -741,7 +739,6 @@ def test_plugin_system_on_window_create(session):
     builder.build(session=session)
 
     proc = session.cmd('display-message', '-p', "'#W'") 
-    
     assert proc.stdout[0] == "'plugin_test_owc'"
 
 
@@ -758,5 +755,61 @@ def test_plugin_system_after_window_finished(session):
     builder.build(session=session)
 
     proc = session.cmd('display-message', '-p', "'#W'") 
+    assert proc.stdout[0] == "'plugin_test_awf'"
+
+
+def test_plugin_system_on_window_create_multiple_windows(session):
+    config_plugins = loadfixture("workspacebuilder/plugin_owc_multiple_windows.yaml")
+
+    sconfig = kaptan.Kaptan(handler='yaml')
+    sconfig = sconfig.import_config(config_plugins).get()
+    sconfig = config.expand(sconfig)
+
+    builder = WorkspaceBuilder(sconf=sconfig)
+    assert len(builder.plugins) > 0
+
+    builder.build(session=session)
+
+    proc = session.cmd('list-windows', '-F', "'#W'")
+    assert "'plugin_test_owc_mw'" in proc.stdout 
+    assert "'plugin_test_owc_mw_2'" in proc.stdout 
 
-    assert proc.stdout[0] == "'plugin_test_awf'"
+
+def test_plugin_system_after_window_finished_multiple_windows(session):
+    config_plugins = loadfixture("workspacebuilder/plugin_awf_multiple_windows.yaml")
+
+    sconfig = kaptan.Kaptan(handler='yaml')
+    sconfig = sconfig.import_config(config_plugins).get()
+    sconfig = config.expand(sconfig)
+
+    builder = WorkspaceBuilder(sconf=sconfig)
+    assert len(builder.plugins) > 0
+
+    builder.build(session=session)
+
+    proc = session.cmd('list-windows', '-F', "'#W'")
+    assert "'plugin_test_awf_mw'" in proc.stdout 
+    assert "'plugin_test_awf_mw_2'" in proc.stdout 
+
+
+def test_plugin_system_multiple_plugins(session):
+    config_plugins = loadfixture("workspacebuilder/plugin_multiple_plugins.yaml")
+
+    sconfig = kaptan.Kaptan(handler='yaml')
+    sconfig = sconfig.import_config(config_plugins).get()
+    sconfig = config.expand(sconfig)
+
+    builder = WorkspaceBuilder(sconf=sconfig)
+    assert len(builder.plugins) > 0
+
+    builder.build(session=session)
+
+    # Drop through to the before_script plugin hook
+    proc = session.cmd('display-message', '-p', "'#S'") 
+    assert proc.stdout[0] == "'plugin_test_bs'"
+
+    # Drop through to the after_window_finished. This won't succeed
+    # unless on_window_create succeeds because of how the test plugin
+    # override methods are currently written
+    proc = session.cmd('display-message', '-p', "'#W'") 
+    assert proc.stdout[0] == "'mp_test_awf'"

tmuxp/workspacebuilder.py

@@ -212,7 +212,6 @@ def build(self, session=None):
 
         # Runs after before_script
         for plugin in self.plugins:
-            print('workspacebuilder - plugin.before_script')
             plugin.before_script(self.session)
 
         for w, wconf in self.iter_create_windows(session):