Merge pull request elastic#7629 from spalger/fix/7628

[ui/doc_viewer] ensure the ui/render_directive is imported
airow · Jul 5, 2016 · 935f597 · 935f597
2 parents b86d780 + e98c3d4
commit 935f597
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/src/ui/public/doc_viewer/doc_viewer.js b/src/ui/public/doc_viewer/doc_viewer.js
@@ -3,6 +3,7 @@ import $ from 'jquery';
 import uiModules from 'ui/modules';
 import DocViewsProvider from 'ui/registry/doc_views';
 
+import 'ui/render_directive';
 import 'ui/doc_viewer/doc_viewer.less';
 
 uiModules.get('kibana')

diff --git a/test/scripts/jenkins_build_snapshot.sh b/test/scripts/jenkins_build_snapshot.sh
@@ -4,4 +4,4 @@ set -e
 
 "$(dirname $0)/jenkins_setup.sh"
 
-"$(npm bin)/grunt" build;
+"$GRUNT" build;
diff --git a/test/scripts/jenkins_setup.sh b/test/scripts/jenkins_setup.sh
@@ -31,3 +31,11 @@ nvm install "$(cat .node-version)"
 ### NPM ###
 ###*****###
 npm install
+
+
+if [ -z "$(npm bin)" ]; then
+  echo "npm does not know where it stores executables..... huh??"
+  exit 1
+fi
+
+export GRUNT="$(npm bin)/grunt"
diff --git a/test/scripts/jenkins_unit.sh b/test/scripts/jenkins_unit.sh
@@ -4,4 +4,4 @@ set -e
 
 "$(dirname $0)/jenkins_setup.sh"
 
-xvfb-run "$(npm bin)/grunt" jenkins:unit;
+xvfb-run "$GRUNT" jenkins:unit;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,4 @@ set -e

		"$(dirname $0)/jenkins_setup.sh"

		"$(npm bin)/grunt" build;
		"$GRUNT" build;