Merge branch '1.0' into 1.1

Zhen · Zhen · commit 548a4aa0a0b1 · 2016-06-07T16:25:50.000+02:00
diff --git a/neokit b/neokit
@@ -1 +1 @@
-Subproject commit 46d80413782e08338d6747f25508ea94bcd1c7c2
+Subproject commit 6506ce944a47f78e071f49b600df588a3fe91e28
diff --git a/runTests.ps1 b/runTests.ps1
@@ -10,7 +10,8 @@ try
 	}
 	else
 	{
-		npm run start-neo4j -- --neorun.start.args="$args"
+		$env.NEORUN_START_ARGS="$args"
+		npm run start-neo4j
 	}
 
 	npm test
diff --git a/runTests.sh b/runTests.sh
@@ -11,7 +11,8 @@ if [ "$1" == "" ]; then
     npm run start-neo4j
 else
     # Example: ./runTests.sh '-v 3.0.1 -p neo4j'
-    npm run start-neo4j -- --neorun.start.args=\'"$1"\'
+    # Example: npm run start-neo4j -- --neorun.start.args='-v 3.0.1 -p neo4j'
+    NEORUN_START_ARGS="$1" npm run start-neo4j
 fi
 
 sleep 2

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,8 @@ try`
`10`	`10`	`}`
`11`	`11`	`else`
`12`	`12`	`{`
`13`		`- npm run start-neo4j -- --neorun.start.args="$args"`
	`13`	`+ $env.NEORUN_START_ARGS="$args"`
	`14`	`+ npm run start-neo4j`
`14`	`15`	`}`
`15`	`16`
`16`	`17`	`npm test`