From 0b1096ff63dfcaff842f24cd53dc2017a6c21a3b Mon Sep 17 00:00:00 2001 From: Ilya Dus Date: Mon, 11 Mar 2019 11:30:24 +0300 Subject: [PATCH] Changed 1.1.x version constraints to 2.0.x everywhere --- README.md | 2 +- bin/kong-dashboard.js | 4 ++-- tests/cases/plugins/basic-auth.spec.js | 6 +++--- tests/cases/sidebar.spec.js | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 5880aec..420992f 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ and services such as requests routing, authentication, rate limiting, etc. | 3.1.x, 3.2.x | >= 0.9, <0.13 | >= 6.0.0 | | 3.3.x, 3.4.x | >= 0.9, <0.14 | >= 6.0.0 | | 3.5.x | >= 0.9, <0.15 | >= 6.0.0 | -| 3.6.x | >= 0.9, <1.1.x | >= 6.0.0 | +| 3.6.x | >= 0.9, <2.0.0 | >= 6.0.0 | Notes: * Kong Dashboard 3.3.0 is only partially compatible with Kong 0.13. It does not support the new Service and Route diff --git a/bin/kong-dashboard.js b/bin/kong-dashboard.js index a57565d..1c4289b 100755 --- a/bin/kong-dashboard.js +++ b/bin/kong-dashboard.js @@ -162,8 +162,8 @@ function start(argv) { terminal.error("This version of Kong dashboard doesn't support Kong v0.9 and lower."); process.exit(1); } - if (semver.gte(version, '1.1.0')) { - terminal.error("This version of Kong dashboard doesn't support Kong v1.1 and higher."); + if (semver.gte(version, '2.0.0')) { + terminal.error("This version of Kong dashboard doesn't support Kong v2.0 and higher."); process.exit(1); } terminal.success("Connected to Kong on " + argv.kongUrl + "."); diff --git a/tests/cases/plugins/basic-auth.spec.js b/tests/cases/plugins/basic-auth.spec.js index 0ad9ce9..c8d38b0 100644 --- a/tests/cases/plugins/basic-auth.spec.js +++ b/tests/cases/plugins/basic-auth.spec.js @@ -72,7 +72,7 @@ describe('Basic Auth plugin testing:', () => { 'config': {'hide_credentials': true, 'anonymous': anonymousConsumer.id}, 'enabled': true }; - } else if (semver.satisfies(process.env.KONG_VERSION, '>=0.15.0 < 1.1.0')) { + } else if (semver.satisfies(process.env.KONG_VERSION, '>=0.15.0 < 2.0.0')) { inputs = { 'name': 'basic-auth', 'run_on' : 'first', @@ -195,7 +195,7 @@ describe('Basic Auth plugin testing:', () => { 'api_id': 'All', 'config-hide_credentials': true }; - } else if (semver.satisfies(process.env.KONG_VERSION, '>=0.15.0 < 1.1.0')) { + } else if (semver.satisfies(process.env.KONG_VERSION, '>=0.15.0 < 2.0.0')) { inputs = { 'name': 'basic-auth', 'run_on' : 'first', @@ -210,7 +210,7 @@ describe('Basic Auth plugin testing:', () => { name: 'basic-auth', config: {hide_credentials: false} }); - } else if (semver.satisfies(process.env.KONG_VERSION, '>=0.15.0 < 1.1.0')) { + } else if (semver.satisfies(process.env.KONG_VERSION, '>=0.15.0 < 2.0.0')) { Kong.createPlugin({ name: 'basic-auth', run_on: 'first', diff --git a/tests/cases/sidebar.spec.js b/tests/cases/sidebar.spec.js index d03c0fc..04d6f81 100644 --- a/tests/cases/sidebar.spec.js +++ b/tests/cases/sidebar.spec.js @@ -20,7 +20,7 @@ describe('Sidebar testing', () => { if (semver.satisfies(process.env.KONG_VERSION, '0.9.x')) { expect(Sidebar.getLinkElement('Certificates').isPresent()).toBeFalsy(); } - else if (semver.satisfies(process.env.KONG_VERSION, '>=0.10.0 < 1.1.0')) { + else if (semver.satisfies(process.env.KONG_VERSION, '>=0.10.0 < 2.0.0')) { expect(Sidebar.getLinkElement('Certificates').isPresent()).toBeTruthy(); } else {