updated tests

Author: pichillilorenzo

main.py

@@ -6,7 +6,6 @@
 from .src.libs import *
 from .src.commands import *
 from .src.listeners import *
-from .tests import *
 
 keymaps = util.open_json(os.path.join(PACKAGE_PATH, 'Default.sublime-keymap'))
 for keymap in keymaps:

src/listeners/project/npm/Main_disabled.sublime-menu

@@ -1 +1 @@
-[{"id": "tools", "caption": "Tools", "children": [{"id": "npm_scripts", "caption": "Npm/Yarn Scripts", "children": []}]}]
+[{"id": "tools", "children": [{"id": "npm_scripts", "children": [], "caption": "Npm/Yarn Scripts"}], "caption": "Tools"}]

tests/__init__.py

@@ -1,9 +1,13 @@
 import sublime
-import time
+import time, os
 from unittesting import DeferrableTestCase
 JavaScriptEnhancements = __import__('JavaScript Enhancements')
 flow_ide_clients = JavaScriptEnhancements.src.libs.flow_ide_clients
 JavascriptEnhancementsStartFlowIDEServerEventListener = JavaScriptEnhancements.src.libs.JavascriptEnhancementsStartFlowIDEServerEventListener
+PACKAGE_PATH = JavaScriptEnhancements.src.libs.global_vars.PACKAGE_PATH
+
+def plugin_ready():
+  return os.path.exists(os.path.join(PACKAGE_PATH, "node_modules", ".bin"))
 
 timeout = 30
 
@@ -22,12 +26,15 @@ def tearDown(self):
       self.view.window().run_command("close_file")
 
   def test_completions(self):
+    
+    start_time = time.time()
 
-    for x in JavaScriptEnhancements.tests.wait_plugin_ready():
-      if not x:
-        yield 100
+    while not plugin_ready():
+      if time.time() - start_time <= timeout:
+        yield 200
       else:
-        break
+        raise TimeoutError("plugin is not ready in " + str(timeout) + " seconds")
+
     self.view.run_command("insert", {"characters": "\ndocument."})
 
     JavascriptEnhancementsStartFlowIDEServerEventListener().start_server(self.view)
@@ -46,7 +53,6 @@ def test_completions(self):
 
       else:
         raise TimeoutError("auto_complete popup doesn't show up in " + str(timeout) + " seconds")
-        break
 
     self.view.run_command("commit_completion")
 

tests/plugin_ready.py

@@ -4,6 +4,7 @@
 from unittesting import DeferrableTestCase
 JavaScriptEnhancements = __import__('JavaScript Enhancements')
 util = JavaScriptEnhancements.src.libs.util
+PACKAGE_PATH = JavaScriptEnhancements.src.libs.global_vars.PACKAGE_PATH
 
 project_path = os.path.join(os.path.expanduser("~"), "javascript_enhancements_project_test")
 project_settings = {
@@ -15,20 +16,36 @@
   'bookmarks': []
 }
 
+def plugin_ready():
+  return os.path.exists(os.path.join(PACKAGE_PATH, "node_modules", ".bin"))
+
+timeout = 30
+
 class TestProject(DeferrableTestCase):
 
   def setUp(self):
-    self.window = sublime.active_window()
+    sublime.run_command('new_window')
+    self.view = sublime.active_window().new_file()
+    self.window = self.view.window()
     if os.path.isdir(project_path):
       shutil.rmtree(project_path)
 
   def tearDown(self):
     global project_path
     sublime.active_window().run_command("close")
+    sublime.active_window().run_command("close")
     if os.path.isdir(project_path):
       shutil.rmtree(project_path)
 
   def test_project(self):
+    start_time = time.time()
+
+    while not plugin_ready():
+      if time.time() - start_time <= timeout:
+        yield 200
+      else:
+        raise TimeoutError("plugin is not ready in " + str(timeout) + " seconds")
+
     self.window.run_command("javascript_enhancements_create_new_project")
     yield 1000
     self.window.run_command("insert", {"characters": "empty"})