summaryrefslogtreecommitdiff
path: root/js/test/Common/Common.js
diff options
context:
space:
mode:
authorJoe George <joe@zeroc.com>2015-04-22 15:55:59 -0400
committerJoe George <joe@zeroc.com>2015-04-23 14:35:45 -0400
commitb5b19c1640c2d85d24073432477136487ed1bdcc (patch)
tree47beab55d3cff877f388bb61c977a372b930bb95 /js/test/Common/Common.js
parentICE-6450 Dependencies and system headers (diff)
downloadice-b5b19c1640c2d85d24073432477136487ed1bdcc.tar.bz2
ice-b5b19c1640c2d85d24073432477136487ed1bdcc.tar.xz
ice-b5b19c1640c2d85d24073432477136487ed1bdcc.zip
Various Ice for JavaScript changes
* Rename zeroc-ice to ice * Fix slice2js to generate code with requrie('ice') * Update tests * Slim bower.json
Diffstat (limited to 'js/test/Common/Common.js')
-rw-r--r--js/test/Common/Common.js12
1 files changed, 6 insertions, 6 deletions
diff --git a/js/test/Common/Common.js b/js/test/Common/Common.js
index 7029a61d846..d2bb087dd4f 100644
--- a/js/test/Common/Common.js
+++ b/js/test/Common/Common.js
@@ -7,26 +7,26 @@
//
// **********************************************************************
-(function(module, require, exports){
- var Ice = require("zeroc-icejs").Ice;
+(function(module, require, exports){
+ var Ice = require("ice").Ice;
var write = function(msg)
{
- process.stdout.write(msg);
+ process.stdout.write(msg);
};
var writeLine = function(msg)
{
this.write(msg + "\n");
};
-
+
var run = function(m)
{
var id = new Ice.InitializationData();
id.properties = Ice.createProperties(process.argv);
-
+
var test = m.require("./Client").__test__;
-
+
test({write: write, writeLine: writeLine}, id).exception(
function(ex, r)
{