|
17 | 17 |
|
18 | 18 | 'use strict';
|
19 | 19 | const EnterpriseManagementV1 = require('../../dist/enterprise-management/v1');
|
20 |
| -const { readExternalSources } = require('ibm-cloud-sdk-core'); |
| 20 | +const { readExternalSources, getQueryParam } = require('ibm-cloud-sdk-core'); |
21 | 21 | const authHelper = require('../resources/auth-helper.js');
|
22 | 22 |
|
23 | 23 | // testcase timeout value (200s).
|
@@ -97,7 +97,7 @@ describe('EnterpriseManagementV1_integration', () => {
|
97 | 97 | results = results.concat(res.result.resources);
|
98 | 98 |
|
99 | 99 | if (res.result.next_url) {
|
100 |
| - nextDocid = getNextDocid(res.result.next_url); |
| 100 | + nextDocid = getQueryParam(res.result.next_url, 'next_docid'); |
101 | 101 | } else {
|
102 | 102 | nextDocid = null;
|
103 | 103 | }
|
@@ -162,7 +162,7 @@ describe('EnterpriseManagementV1_integration', () => {
|
162 | 162 | results = results.concat(res.result.resources);
|
163 | 163 |
|
164 | 164 | if (res.result.next_url) {
|
165 |
| - nextDocid = getNextDocid(res.result.next_url); |
| 165 | + nextDocid = getQueryParam(res.result.next_url, 'next_docid'); |
166 | 166 | } else {
|
167 | 167 | nextDocid = null;
|
168 | 168 | }
|
@@ -211,7 +211,7 @@ describe('EnterpriseManagementV1_integration', () => {
|
211 | 211 | results = results.concat(res.result.resources);
|
212 | 212 |
|
213 | 213 | if (res.result.next_url) {
|
214 |
| - nextDocid = getNextDocid(res.result.next_url); |
| 214 | + nextDocid = getQueryParam(res.result.next_url, 'next_docid'); |
215 | 215 | } else {
|
216 | 216 | nextDocid = null;
|
217 | 217 | }
|
@@ -242,14 +242,3 @@ describe('EnterpriseManagementV1_integration', () => {
|
242 | 242 | expect(res.result).toBeDefined();
|
243 | 243 | });
|
244 | 244 | });
|
245 |
| - |
246 |
| -function getNextDocid(urlstring) { |
247 |
| - let offset = null; |
248 |
| - if (urlstring) { |
249 |
| - // We use a bogus "baseurl" in case "urlstring" is a relative url. |
250 |
| - // This is fine since we're only trying to retrieve the "offset" query parameter. |
251 |
| - const url = new URL(urlstring, 'https://fakehost.com'); |
252 |
| - offset = url.searchParams.get('next_docid'); |
253 |
| - } |
254 |
| - return offset; |
255 |
| -} |
0 commit comments