fix: fix functional tests (#1578)

screwdriver-cd · Apr 5, 2019 · 1b926d2 · 1b926d2
1 parent 9453a79
commit 1b926d2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/features/step_definitions/git-flow.js b/features/step_definitions/git-flow.js
@@ -6,7 +6,7 @@ const sdapi = require('../support/sdapi');
 const github = require('../support/github');
 const { defineSupportCode } = require('cucumber');
 
-const TIMEOUT = 800 * 1000;
+const TIMEOUT = 500 * 1000;
 
 defineSupportCode(({ Before, Given, When, Then }) => {
     Before({
@@ -183,7 +183,7 @@ defineSupportCode(({ Before, Given, When, Then }) => {
     Then(/^any existing builds should be stopped$/, {
         timeout: TIMEOUT
     }, function step() {
-        const desiredStatus = ['ABORTED', 'SUCCESS'];
+        const desiredStatus = ['ABORTED', 'SUCCESS', 'FAILURE'];
 
         return sdapi.waitForBuildStatus({
             buildId: this.previousBuildId,

diff --git a/features/support/github.js b/features/support/github.js
@@ -73,8 +73,7 @@ function closePullRequest(token, repoOwner, repoName, prNumber) {
         owner: repoOwner,
         repo: repoName,
         number: prNumber,
-        state: 'closed',
-        base: 'master'
+        state: 'closed'
     });
 }