[OLINGO-439] start node and mocha tests
diff --git a/odatajs/package.json b/odatajs/package.json
index 298a4e2..0323953 100644
--- a/odatajs/package.json
+++ b/odatajs/package.json
@@ -2,8 +2,7 @@
"name": "odatajs",
"version": "4.0.0",
"postfix": "beta-01",
- "releaseCandidate" : "",
-
+ "releaseCandidate": "",
"title": "Olingo OData Client for JavaScript",
"description": "the Olingo OData Client for JavaScript library is a new cross-browser JavaScript library that enables data-centric web applications by leveraging modern protocols such as JSON and OData and HTML5-enabled browser features. It's designed to be small, fast and easy to use.",
"homepage": "http://olingo.apache.org",
@@ -30,7 +29,9 @@
"email": "challenh@apache.org"
}
],
- "scripts": {},
+ "scripts": {
+ "preinstall": "npm --prefix ./grunt-config/custom-tasks/rat install"
+ },
"devDependencies": {
"grunt": "^0.4.5",
"grunt-connect-proxy": "^0.1.10",
diff --git a/odatajs/src/browser-lib-tpl.js b/odatajs/src/browser-lib-tpl.js
deleted file mode 100644
index 9c335db..0000000
--- a/odatajs/src/browser-lib-tpl.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-var init = function(exports, module, require) {
- '<% initFunction %>'
-};
-
-var datas = '<% filesAsFunctionList %>';
-
-var modules = {};
-
-var require = function(path) {
- var name = path.substring(path.lastIndexOf('/')+1,path.length-3);
- if (modules[name]) { return modules[name].exports; }
-
- modules[name] = { exports : {}};
- console.log(name);
- if (name === 'sou') {
- var i = 0;
- }
- datas[name].call(this,modules[name].exports,modules[name],require);
- return modules[name].exports;
- };
-
-window.odatajs = {};
-init.call(this,window.odatajs,window.odatajs,require);
-
-
diff --git a/odatajs/src/index-browser.js b/odatajs/src/index-browser.js
index 1f52e6b..6301acf 100644
--- a/odatajs/src/index-browser.js
+++ b/odatajs/src/index-browser.js
@@ -25,7 +25,7 @@
exports.utils = require('./lib/utils.js');
// only needed for xml metadata
-exports.xml = require('./lib/ext/xml.js');
+exports.xml = require('./lib/xml.js');
// only need in browser case
exports.oData = require('./lib/odata.js');
diff --git a/odatajs/src/index-node.js b/odatajs/src/index-node.js
index 28bf066..85aea5b 100644
--- a/odatajs/src/index-node.js
+++ b/odatajs/src/index-node.js
@@ -30,7 +30,7 @@
odatajs.utils = require('./lib/utils.js');
// only neede for xml metadata
-odatajs.xml = require('./lib/ext/xml.js');
+odatajs.xml = require('./lib/xml.js');
// only need in browser case
odatajs.oData = require('./lib/odata.js');
diff --git a/odatajs/src/lib/odata/json.js b/odatajs/src/lib/odata/json.js
index 6955cbe..b15a385 100644
--- a/odatajs/src/lib/odata/json.js
+++ b/odatajs/src/lib/odata/json.js
@@ -157,7 +157,6 @@
* @return An object representation of the OData payload.</returns>
*/
function jsonParser(handler, text, context) {
-
var recognizeDates = defined(context.recognizeDates, handler.recognizeDates);
var model = context.metadata;
var json = (typeof text === "string") ? JSON.parse(text) : text;
diff --git a/odatajs/src/lib/xml.js b/odatajs/src/lib/xml.js
index e519c60..b8af4fe 100644
--- a/odatajs/src/lib/xml.js
+++ b/odatajs/src/lib/xml.js
@@ -20,7 +20,7 @@
/** @module datajs/xml */
-var utils = require('./../utils.js');
+var utils = require('./utils.js');
var activeXObject = utils.activeXObject;
var djsassert = utils.djsassert;
diff --git a/odatajs/test-node/test.html b/odatajs/test-node/test.html
deleted file mode 100644
index 12e75dd..0000000
--- a/odatajs/test-node/test.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */-->
-<html>
- <head>
- <meta http-equiv="X-UA-Compatible" content="IE=Edge" />
- <title>datajs startup perf test</title>
- <script type="text/javascript" src="./../src/index2.js" ></script>
- <script type="text/javascript" src="./../src/include.js" ></script>
- </head>
- <body>
- XXX
- </body>
-</html>
diff --git a/odatajs/test-node/test.js b/odatajs/test-node/test.js
deleted file mode 100644
index 263366b..0000000
--- a/odatajs/test-node/test.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-var x = require('./../src/index-no-browserify.js');
-//x.show();
-//x.included.show();
-console.log(x);
\ No newline at end of file
diff --git a/odatajs/tests/odata-json-tests.js b/odatajs/tests/odata-json-tests.js
index 7d30a7c..a67fcf2 100644
--- a/odatajs/tests/odata-json-tests.js
+++ b/odatajs/tests/odata-json-tests.js
@@ -23,7 +23,7 @@
djstest.addTest(function isArrayTest() {
- console.log("hier-----------------------");
+ //also on node
djstest.assert(odatajs.utils.isArray([]));
djstest.assert(odatajs.utils.isArray([1, 2]));
djstest.assert(!odatajs.utils.isArray({}));
