From ebdbd7eff847d01f5ce938a0b37bbc65a27eae2a Mon Sep 17 00:00:00 2001
From: Michael Hackstein <michael@arangodb.com>
Date: Mon, 8 Apr 2013 22:11:34 +0200
Subject: [PATCH] GraphViewer: Added Dispatcher + DispatcherUI tests to
 runnerAll-Tests

---
 html/admin/js/graphViewer/graphViewer.js                  | 4 ++--
 html/admin/js/graphViewer/jasmine_test/runnerAll.html     | 3 +++
 .../js/graphViewer/jasmine_test/runnerGraphViewer.html    | 8 ++++++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/html/admin/js/graphViewer/graphViewer.js b/html/admin/js/graphViewer/graphViewer.js
index 8620fb81eb..3312718d4c 100644
--- a/html/admin/js/graphViewer/graphViewer.js
+++ b/html/admin/js/graphViewer/graphViewer.js
@@ -276,11 +276,11 @@ function GraphViewer(svg, width, height,
   
   //TODO REMOVE
   //HACK to view the Controls in the Demo
-  
+  /*
   var edgeShaperControls = new EdgeShaperControls($("#controls")[0], edgeShaper);
   edgeShaperControls.addAll();
   var nodeShaperControls = new NodeShaperControls($("#controls")[0], nodeShaper);
   nodeShaperControls.addAll();
-  
+  */
   
 }
\ No newline at end of file
diff --git a/html/admin/js/graphViewer/jasmine_test/runnerAll.html b/html/admin/js/graphViewer/jasmine_test/runnerAll.html
index 31cfa4ce10..b21afd57a9 100644
--- a/html/admin/js/graphViewer/jasmine_test/runnerAll.html
+++ b/html/admin/js/graphViewer/jasmine_test/runnerAll.html
@@ -19,6 +19,7 @@
   <script type="text/javascript" src="../../lib/jquery.livequery.js"></script>
   
   <script type="text/javascript" src="helper/eventHelper.js"></script>
+  <script type="text/javascript" src="helper/mocks.js"></script>
   
   <script type="text/javascript" src="../graphViewer.js"></script>
   <script type="text/javascript" src="../graph/colourMapper.js"></script>
@@ -48,6 +49,8 @@
   <script type="text/javascript" src="specEdgeShaper/edgeShaperUISpec.js"></script>
   <script type="text/javascript" src="specForceLayouter/forceLayouterSpec.js"></script>
   <script type="text/javascript" src="specEvents/eventLibrarySpec.js"></script>
+  <script type="text/javascript" src="specEvents/eventDispatcherSpec.js"></script>
+  <script type="text/javascript" src="specEvents/eventDispatcherUISpec.js"></script>
 
   <!-- run JSLINT -->
   <script type="text/javascript" src="specJSLint/jsLintSpec.js"></script>
diff --git a/html/admin/js/graphViewer/jasmine_test/runnerGraphViewer.html b/html/admin/js/graphViewer/jasmine_test/runnerGraphViewer.html
index 9cf75dd8fa..ea318db7f6 100644
--- a/html/admin/js/graphViewer/jasmine_test/runnerGraphViewer.html
+++ b/html/admin/js/graphViewer/jasmine_test/runnerGraphViewer.html
@@ -18,12 +18,20 @@
   
   <script type="text/javascript" src="helper/eventHelper.js"></script>
   
+  <script type="text/javascript" src="../graph/colourMapper.js"></script>
   <script type="text/javascript" src="../graph/nodeShaper.js"></script>
   <script type="text/javascript" src="../graph/edgeShaper.js"></script>
   <script type="text/javascript" src="../graph/forceLayouter.js"></script>
   <script type="text/javascript" src="../graph/JSONAdapter.js"></script>
   <script type="text/javascript" src="../graph/eventLibrary.js"></script>
   <script type="text/javascript" src="../graph/eventDispatcher.js"></script>
+  
+  <!-- UI Modules> -->
+  <script type="text/javascript" src="../ui/modalDialogHelper.js"></script>
+  <script type="text/javascript" src="../ui/nodeShaperControls.js"></script>
+  <script type="text/javascript" src="../ui/edgeShaperControls.js"></script>
+  
+  
   <script type="text/javascript" src="../graphViewer.js"></script>
   
   <!-- include spec files here... -->