yunkong2/yunkong2.rest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

new

Browse Source
This commit is contained in:
zhongjin
2018-09-21 23:49:05 +08:00
parent d1436af18d
commit 9260e8e0ae
13 changed files with 71 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/lib/setup.js
+2 -2
View File
@@ -321,7 +321,7 @@ function installJsController(cb) {
if (!fs.existsSync(rootDir + 'tmp/node_modules/' + appName + '.js-controller')) {
console.log('installJsController: no js-controller => install from git');
child_process.execSync('npm install https://github.com/' + appName + '/' + appName + '.js-controller/tarball/master --prefix ./ --production', {
child_process.execSync('npm install https://git.spacen.net/' + appName + '/' + appName + '.js-controller/tarball/master --prefix ./ --production', {
cwd: rootDir + 'tmp/',
stdio: [0, 1, 2]
});
@@ -415,7 +415,7 @@ function clearControllerLog() {
}
function clearDB() {
var dirPath = rootDir + 'tmp/iobroker-data/sqlite';
var dirPath = rootDir + 'tmp/yunkong2-data/sqlite';
var files;
try {
if (fs.existsSync(dirPath)) {
test/testApi.js
+2 -2
View File
@@ -49,7 +49,7 @@ describe('Test RESTful API', function() {
});
it('Test RESTful API: get /api/id - must return value', function (done) {
request('http://127.0.0.1:18183/api/system.adapter.template-rest.0.alive', function (error, response, body) {
request('http://127.0.0.1:18183/api/system.adapter.rest.0.alive', function (error, response, body) {
console.log('get /api => ' + body);
expect(error).to.be.not.ok;
var data = JSON.parse(body);
@@ -59,7 +59,7 @@ describe('Test RESTful API', function() {
});
it('Test RESTful API: get /api/plain/id - must return value', function (done) {
request('http://127.0.0.1:18183/api/plain/system.adapter.template-rest.0.alive', function (error, response, body) {
request('http://127.0.0.1:18183/api/plain/system.adapter.rest.0.alive', function (error, response, body) {
console.log('get /api => ' + body);
expect(error).to.be.not.ok;
expect(body).to.be.equal('Value: true');
test/testPackageFiles.js
+3 -3
View File
@@ -52,12 +52,12 @@ describe('Test package.json and io-package.json', function() {
console.log();
}
if (
ioPackage.common.title.indexOf('iobroker') !== -1 ||
ioPackage.common.title.indexOf('ioBroker') !== -1 ||
ioPackage.common.title.indexOf('yunkong2') !== -1 ||
ioPackage.common.title.indexOf('yunkong2') !== -1 ||
ioPackage.common.title.indexOf('adapter') !== -1 ||
ioPackage.common.title.indexOf('Adapter') !== -1
) {
console.log('WARNING: title contains Adapter or ioBroker. It is clear anyway, that it is adapter for ioBroker.');
console.log('WARNING: title contains Adapter or yunkong2. It is clear anyway, that it is adapter for yunkong2.');
console.log();
}
test/testSsl.js
+4 -4
View File
@@ -35,7 +35,7 @@ describe('Test RESTful API SSL', function() {
});
it('Test RESTful API SSL: get /api/plain - must return welcome text', function (done) {
request('https://admin:iobroker@127.0.0.1:18184/api/plain', function (error, response, body) {
request('https://admin:yunkong2@127.0.0.1:18184/api/plain', function (error, response, body) {
console.log('get /api/plain => ' + body);
expect(error).to.be.not.ok;
expect(body).to.be.equal('Welcome to our text REST api!');
@@ -44,7 +44,7 @@ describe('Test RESTful API SSL', function() {
});
it('Test RESTful API SSL: get /api - must return welcome text', function (done) {
request('https://admin:iobroker@127.0.0.1:18184/api', function (error, response, body) {
request('https://admin:yunkong2@127.0.0.1:18184/api', function (error, response, body) {
console.log('get /api => ' + body);
expect(error).to.be.not.ok;
expect(body).to.be.equal('{"message":"Welcome to our JSON REST api!"}');
@@ -53,7 +53,7 @@ describe('Test RESTful API SSL', function() {
});
it('Test RESTful API SSL: get /api/id - must return value', function (done) {
request('https://admin:iobroker@127.0.0.1:18184/api/system.adapter.template-rest.0.alive', function (error, response, body) {
request('https://admin:yunkong2@127.0.0.1:18184/api/system.adapter.rest.0.alive', function (error, response, body) {
console.log('get /api => ' + body);
expect(error).to.be.not.ok;
var data = JSON.parse(body);
@@ -63,7 +63,7 @@ describe('Test RESTful API SSL', function() {
});
it('Test RESTful API SSL: get /api/plain/id - must return value', function (done) {
request('https://admin:iobroker@127.0.0.1:18184/api/plain/system.adapter.template-rest.0.alive', function (error, response, body) {
request('https://admin:yunkong2@127.0.0.1:18184/api/plain/system.adapter.rest.0.alive', function (error, response, body) {
console.log('get /api => ' + body);
expect(error).to.be.not.ok;
expect(body).to.be.equal('Value: true');