Merge branch 'feat/backend-plugin' of github.com:spotify/backstage into feat/backend-plugin

* 'feat/backend-plugin' of github.com:spotify/backstage:
  chore(cli): updating issues with wrong package version
  chore(cli): updating endpoint for test
  chore(cli): fixing winston dependency
  chore(cli): fixing dependenceis:Wq
  chore(cli): need to make a module
  chore(cli): update eslint rules
This commit is contained in:
blam
2020-09-21 00:08:11 +02:00
4 changed files with 8 additions and 5 deletions
@@ -1,3 +1,3 @@
module.exports = {
extends: [require.resolve('@backstage/cli/config/eslint')],
extends: [require.resolve('@backstage/cli/config/eslint.backend')],
};
@@ -25,8 +25,9 @@
"@types/express": "^4.17.6",
"express": "^4.17.1",
"express-promise-router": "^3.0.3",
"yn": "^4.0.0",
"whatwg-fetch": "^3.2.0"
"whatwg-fetch": "^2.0.0",
"winston": "^3.2.1",
"yn": "^4.0.0"
},
"devDependencies": {
"@backstage/cli": "^{{version}}",
@@ -34,9 +34,9 @@ describe('createRouter', () => {
jest.resetAllMocks();
});
describe('GET /ping', () => {
describe('GET /health', () => {
it('returns ok', async () => {
const response = await request(app).get('/ping');
const response = await request(app).get('/health');
expect(response.status).toEqual(200);
expect(response.body).toEqual({ status: 'ok' });
@@ -14,3 +14,5 @@
* limitations under the License.
*/
require('whatwg-fetch');
export {};