Reach > 90% coverage and add Integration Testing

.gitlab-ci.yml

@@ -72,56 +72,52 @@ test:unit:utils:
   stage: test
   script: yarn jest utils/test/unit && yarn codecov -F utils
 
-# Integration Tests
-# .test:integration: &integration
-#   image:
-#     name: docker/compose:latest
-#     entrypoint: ['/bin/sh', '-c']
-#   variables:
-#     DOCKER_HOST: tcp://docker:2375
-#     GITLAB_URL: http://docker:8080
-#   services:
-#     - docker:dind
-#   stage: test
-#   before_script:
-#     # Install docker compose
-#     - apk add --no-cache nodejs yarn git
-
-#     # Spin up container
-#     - cd scripts
-#     - docker-compose -f docker-compose.yml up -d
-
-#     # Verify Gitlab instance is up and running
-#     - node probe.js
-
-#     # Get the personal token
-#     - export PERSONAL_ACCESS_TOKEN=$(docker exec -i gitlab sh -c 'gitlab-rails r /mnt/init.rb')
-
-#     - cd ..
-#     - echo $PERSONAL_ACCESS_TOKEN
-#     - echo $GITLAB_URL
-#     - echo $CODECOV_TOKEN
+#Integration Tests
+.test:integration: &integration
+  image:
+    name: docker/compose:latest
+    entrypoint: ['/bin/sh', '-c']
+  variables:
+    DOCKER_HOST: tcp://docker:2375
+    GITLAB_URL: http://docker:8080
+  services:
+    - docker:dind
+  stage: test
+  before_script:
+    # Install docker compose
+    - apk add --no-cache nodejs yarn git
+
+    # Spin up container
+    - cd scripts
+    - docker-compose -f docker-compose.yml up -d
+
+    # Verify Gitlab instance is up and running
+    - node probe.js
+
+    # Get the personal token
+    - export PERSONAL_ACCESS_TOKEN=$(docker exec -i gitlab sh -c 'gitlab-rails r /mnt/init.rb')
+
+    - cd ..
+    - echo $PERSONAL_ACCESS_TOKEN
+    - echo $GITLAB_URL
+    - echo $CODECOV_TOKEN
 
 test:integration:browser:
   image: buildkite/puppeteer
   stage: test
   script: yarn jest browser/test/integration
 
-# test:integration:node:
-#   <<: *integration
-#   script: yarn jest node/test/integration && yarn codecov -F node
-
-# test:cli:integration:dist:
-#   <<: *integration
-#   script: yarn jest core/test/integration --runInBand && yarn codecov
+test:integration:node:src:
+  <<: *integration
+  script: yarn jest node/test/integration && yarn codecov -F node
 
-# test:core:integration:dist-cjs:
-#   <<: *integration
-#   script: yarn jest core/test/integration --runInBand --moduleNameMapper="{dist:dist/index.es.js}"
+test:integration:node:dist-cjs:
+  <<: *integration
+  script: yarn jest node/test/integration --moduleNameMapper='{"src":"<rootDir>/dist/index.js"}'
 
-# test:core:integration:dist-es
-#   <<: *integration
-#   script: yarn jest core/test/integration --runInBand --moduleNameMapper="{dist:dist/index.es.js}"
+test:integration:node:dist-es:
+  <<: *integration
+  script: yarn jest node/test/integration --moduleNameMapper='{"src":"<rootDir>/dist/index.js"}'
 
 # Canary
 canary:

codecov.yml

@@ -13,7 +13,7 @@ coverage:
         target: 60%
         flags: cli
       core:
-        target: 60%
+        target: 90%
         flags: core
       browser:
         target: 60%

packages/gitbeaker-core/src/infrastructure/Utils.ts

@@ -15,7 +15,7 @@ export interface Bundle<T extends { [name: string]: Constructor }, P extends key
 
 export function bundler<T extends { [name: string]: Constructor }, P extends keyof T>(services: T) {
   return (function Bundle(options?: any) {
-    Object.entries(services || {}).forEach(([name, Ser]) => {
+    Object.entries(services).forEach(([name, Ser]) => {
       this[name] = new Ser(options);
     });
   } as any) as Bundle<T, P>;

packages/gitbeaker-core/src/infrastructure/index.ts

@@ -1,3 +1,3 @@
 export * from './BaseService';
-export { bundler } from './Utils';
+export * from './Utils';
 export * from './RequestHelper';

packages/gitbeaker-core/src/services/BroadcastMessages.ts

@@ -3,6 +3,7 @@ import {
   BaseService,
   PaginatedRequestOptions,
   RequestHelper,
+  Sudo,
 } from '../infrastructure';
 
 export class BroadcastMessages extends BaseService {
@@ -20,10 +21,10 @@ export class BroadcastMessages extends BaseService {
     return RequestHelper.put(this, `broadcast_messages/${bId}`, options);
   }
 
-  remove(broadcastMessageId: number) {
+  remove(broadcastMessageId: number, options?: Sudo) {
     const bId = encodeURIComponent(broadcastMessageId);
 
-    return RequestHelper.del(this, `broadcast_messages/${bId}`);
+    return RequestHelper.del(this, `broadcast_messages/${bId}`, options);
   }
 
   show(broadcastMessageId: number, options?: BaseRequestOptions) {

packages/gitbeaker-core/src/services/CommitDiscussions.ts

@@ -51,7 +51,7 @@ export interface CommitDiscussions extends ResourceDiscussions {
 }
 
 export class CommitDiscussions extends ResourceDiscussions {
-  constructor(options: BaseServiceOptions = {}) {
+  constructor(options: BaseServiceOptions) {
     super('projects', 'commits', options);
   }
 }

packages/gitbeaker-core/src/services/DeployKeys.ts

@@ -13,7 +13,7 @@ export class DeployKeys extends BaseService {
     return RequestHelper.post(this, `projects/${pId}/deploy_keys`, options);
   }
 
-  all({ projectId, ...options }: { projectId?: string | number } & PaginatedRequestOptions) {
+  all({ projectId, ...options }: { projectId?: string | number } & PaginatedRequestOptions = {}) {
     let url;
 
     if (projectId) {

packages/gitbeaker-core/src/services/EpicDiscussions.ts

@@ -51,7 +51,7 @@ export interface EpicDiscussions extends ResourceDiscussions {
 }
 
 export class EpicDiscussions extends ResourceDiscussions {
-  constructor(options: BaseServiceOptions = {}) {
+  constructor(options: BaseServiceOptions) {
     super('groups', 'epics', options);
   }
 }

packages/gitbeaker-core/src/services/EpicNotes.ts

@@ -45,7 +45,7 @@ export interface EpicNotes extends ResourceNotes {
 }
 
 export class EpicNotes extends ResourceNotes {
-  constructor(options: BaseServiceOptions = {}) {
+  constructor(options: BaseServiceOptions) {
     super('groups', 'epics', options);
   }
 }

packages/gitbeaker-core/src/services/GitLabCIYMLTemplates.ts

@@ -2,7 +2,7 @@ import { ResourceTemplates } from '../templates';
 import { BaseServiceOptions } from '../infrastructure';
 
 export class GitLabCIYMLTemplates extends ResourceTemplates {
-  constructor(options: BaseServiceOptions = {}) {
+  constructor(options: BaseServiceOptions) {
     super('gitlab_ci_ymls', options);
   }
 }

packages/gitbeaker-core/src/services/GitignoreTemplates.ts

@@ -2,7 +2,7 @@ import { ResourceTemplates } from '../templates';
 import { BaseServiceOptions } from '../infrastructure';
 
 export class GitignoreTemplates extends ResourceTemplates {
-  constructor(options: BaseServiceOptions = {}) {
+  constructor(options: BaseServiceOptions) {
     super('gitignores', options);
   }
 }

packages/gitbeaker-core/src/services/GroupAccessRequests.ts

@@ -2,7 +2,7 @@ import { ResourceAccessRequests } from '../templates';
 import { BaseServiceOptions } from '../infrastructure';
 
 export class GroupAccessRequests extends ResourceAccessRequests {
-  constructor(options: BaseServiceOptions = {}) {
+  constructor(options: BaseServiceOptions) {
     super('groups', options);
   }
 }

packages/gitbeaker-core/src/services/GroupBadges.ts

@@ -21,7 +21,7 @@ export interface GroupBadges extends ResourceBadges {
 }
 
 export class GroupBadges extends ResourceBadges {
-  constructor(options: BaseServiceOptions = {}) {
+  constructor(options: BaseServiceOptions) {
     super('groups', options);
   }
 }

packages/gitbeaker-core/src/services/GroupCustomAttributes.ts

@@ -12,7 +12,7 @@ export interface GroupCustomAttributes extends ResourceCustomAttributes {
 }
 
 export class GroupCustomAttributes extends ResourceCustomAttributes {
-  constructor(options: BaseServiceOptions = {}) {
+  constructor(options: BaseServiceOptions) {
     super('groups', options);
   }
 }

packages/gitbeaker-core/src/services/Jobs.ts

@@ -101,19 +101,12 @@ export class Jobs extends BaseService {
     projectId: string | number,
     jobId: number,
     artifactPath: string,
-    { stream = false, ...options }: { stream?: boolean } & BaseRequestOptions,
+    { stream = false, ...options }: { stream?: boolean } & BaseRequestOptions = {},
   ) {
     const [pId, jId] = [projectId, jobId].map(encodeURIComponent);
+    const method = stream ? 'stream' : 'get';
 
-    if (stream) {
-      return RequestHelper.stream(
-        this,
-        `projects/${pId}/jobs/${jId}/artifacts/${artifactPath}`,
-        options,
-      );
-    }
-
-    return RequestHelper.get(
+    return RequestHelper[method](
       this,
       `projects/${pId}/jobs/${jId}/artifacts/${artifactPath}`,
       options,
@@ -124,45 +117,31 @@ export class Jobs extends BaseService {
     projectId: string | number,
     ref: string,
     artifactPath: string,
-    name: string,
-    { stream = false, ...options }: { stream?: boolean } & BaseRequestOptions,
+    jobName: string,
+    { stream = false, ...options }: { stream?: boolean } & BaseRequestOptions = {},
   ) {
-    const [pId, rId, jobName] = [projectId, ref, name].map(encodeURIComponent);
-
-    if (stream) {
-      return RequestHelper.stream(
-        this,
-        `projects/${pId}/jobs/artifacts/${rId}/raw/${artifactPath}?job=${jobName}`,
-        options,
-      );
-    }
+    const [pId, rId, name] = [projectId, ref, jobName].map(encodeURIComponent);
+    const method = stream ? 'stream' : 'get';
 
-    return RequestHelper.get(
+    return RequestHelper[method](
       this,
-      `projects/${pId}/jobs/artifacts/${rId}/raw/${artifactPath}?job=${jobName}`,
+      `projects/${pId}/jobs/artifacts/${rId}/raw/${artifactPath}?job=${name}`,
       options,
     );
   }
 
   downloadLatestArtifactFile(
     projectId: string | number,
     ref: string,
-    name: string,
-    { stream = false, ...options }: { stream?: boolean } & BaseRequestOptions,
+    jobName: string,
+    { stream = false, ...options }: { stream?: boolean } & BaseRequestOptions = {},
   ) {
-    const [pId, rId, jobName] = [projectId, ref, name].map(encodeURIComponent);
-
-    if (stream) {
-      return RequestHelper.stream(
-        this,
-        `projects/${pId}/jobs/artifacts/${rId}/download?job=${jobName}`,
-        options,
-      );
-    }
+    const [pId, rId, name] = [projectId, ref, jobName].map(encodeURIComponent);
+    const method = stream ? 'stream' : 'get';
 
-    return RequestHelper.get(
+    return RequestHelper[method](
       this,
-      `projects/${pId}/jobs/artifacts/${rId}/download?job=${jobName}`,
+      `projects/${pId}/jobs/artifacts/${rId}/download?job=${name}`,
       options,
     );
   }

packages/gitbeaker-core/src/services/MergeRequests.ts

@@ -115,9 +115,9 @@ export class MergeRequests extends BaseService {
     projectId,
     groupId,
     ...options
-  }: ({ projectId: string | number } | { groupId: string | number }) &
+  }: ({ projectId?: string | number } | { groupId?: string | number }) &
     AllMergeRequestsOptions &
-    PaginatedRequestOptions) {
+    PaginatedRequestOptions = {}) {
     let url;
 
     if (projectId) {
@@ -212,7 +212,11 @@ export class MergeRequests extends BaseService {
   closesIssues(projectId: string | number, mergerequestIid: number, options?: Sudo) {
     const [pId, mIid] = [projectId, mergerequestIid].map(encodeURIComponent);
 
-    return RequestHelper.get(this, `projects/${pId}/merge_requests/${mIid}/closes_issues`, options);
+    return RequestHelper.get(
+      this,
+      `projects/${pId}/merge_requests/${mIid}/closes_merge_requests`,
+      options,
+    );
   }
 
   commits(projectId: string | number, mergerequestIid: number, options?: Sudo) {
@@ -315,6 +319,12 @@ export class MergeRequests extends BaseService {
     return RequestHelper.get(this, `projects/${pId}/merge_requests/${mIid}`, options);
   }
 
+  subscribe(projectId: string | number, mergerequestIid: number, options?: Sudo) {
+    const [pId, mIid] = [projectId, mergerequestIid].map(encodeURIComponent);
+
+    return RequestHelper.post(this, `projects/${pId}/merge_requests/${mIid}/subscribe`, options);
+  }
+
   timeStats(projectId: string | number, mergerequestIid: number, options?: Sudo) {
     const [pId, mIid] = [projectId, mergerequestIid].map(encodeURIComponent);
 

packages/gitbeaker-core/src/services/NotificationSettings.ts

@@ -1,4 +1,3 @@
-import { formatQuery } from '@gitbeaker/requester-utils';
 import {
   BaseRequestOptions,
   BaseService,
@@ -16,35 +15,28 @@ type NotificationSettingLevel =
 
 type ProjectOrGroup = { projectId: string | number } | { groupId: string | number } | {};
 
-export class NotificationSettings extends BaseService {
-  all({ projectId, groupId, sudo, ...query }: ProjectOrGroup & PaginatedRequestOptions = {}) {
-    const q = formatQuery(query);
-    let url = '';
+function url({ projectId, groupId }) {
+  let uri = '';
+
+  if (projectId) {
+    uri += `projects/${encodeURIComponent(projectId)}/`;
+  } else if (groupId) {
+    uri += `groups/${encodeURIComponent(groupId)}/`;
+  }
 
-    if (projectId) {
-      url += `projects/${encodeURIComponent(projectId)}/`;
-    } else if (groupId) {
-      url += `groups/${encodeURIComponent(groupId)}/`;
-    }
+  return `${uri}notification_settings`;
+}
 
-    return RequestHelper.get(this, `${url}notification_settings?${q}`, { sudo });
+export class NotificationSettings extends BaseService {
+  all({ projectId, groupId, ...options }: ProjectOrGroup & PaginatedRequestOptions = {}) {
+    return RequestHelper.get(this, url({ groupId, projectId }), options);
   }
 
   edit({
     projectId,
     groupId,
-    sudo,
-    ...query
+    ...options
   }: { level?: NotificationSettingLevel } & ProjectOrGroup & BaseRequestOptions = {}) {
-    const q = formatQuery(query);
-    let url = '';
-
-    if (projectId) {
-      url += `projects/${encodeURIComponent(projectId)}/`;
-    } else if (groupId) {
-      url += `groups/${encodeURIComponent(groupId)}/`;
-    }
-
-    return RequestHelper.put(this, `${url}notification_settings?${q}`, { sudo });
+    return RequestHelper.put(this, url({ groupId, projectId }), options);
   }
 }