[incubator-openwhisk-client-js] branch master updated: Feed test performed operations (delete & update) in wrong order! (#178)

[rabbah]

This is an automated email from the ASF dual-hosted git repository.

rabbah pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/incubator-openwhisk-client-js.git


The following commit(s) were added to refs/heads/master by this push:
     new e3ba6d3  Feed test performed operations (delete & update) in wrong 
order! (#178)
e3ba6d3 is described below

commit e3ba6d3ef49876b91032d4f9df2b91d9ca9f7f6f
Author: James Thomas <ja...@jamesthom.as>
AuthorDate: Mon Jul 1 15:27:21 2019 +0100

    Feed test performed operations (delete & update) in wrong order! (#178)
    
    Re-factored code to be more readable and fixed order issue.
---
 test/integration/feeds.test.js | 44 ++++++++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/test/integration/feeds.test.js b/test/integration/feeds.test.js
index 63ecd79..e41b789 100644
--- a/test/integration/feeds.test.js
+++ b/test/integration/feeds.test.js
@@ -9,6 +9,7 @@ const Triggers = require('../../lib/triggers.js')
 const Client = require('../../lib/client.js')
 const Utils = require('./utils.js')
 const options = Utils.autoOptions()
+const tempTest = Utils.getInsecureFlag() ? test.skip : test
 
 const envParams = ['API_KEY', 'API_HOST', 'NAMESPACE']
 
@@ -21,14 +22,8 @@ envParams.forEach(key => {
 })
 
 const NAMESPACE = process.env.__OW_NAMESPACE
-const tempTest = Utils.getInsecureFlag() ? test.skip : test
-
-tempTest('create, get, update, and delete a feed', t => {
-  const errors = err => {
-    console.log(err)
-    t.fail()
-  }
 
+tempTest('create, get, update, and delete a feed', async t => {
   const feeds = new Feeds(new Client(options))
   const triggers = new Triggers(new Client(options))
   const feedParams = {
@@ -36,19 +31,26 @@ tempTest('create, get, update, and delete a feed', t => {
     trigger: `/${NAMESPACE}/sample_feed_trigger`,
     params: {cron: '*/8 * * * * *', trigger_payload: {name: 'test', place: 
'hello'}}
   }
-  return triggers.create({triggerName: 'sample_feed_trigger'}).then(() => 
feeds.create(feedParams)).then(result => {
+
+  try {
+    await triggers.create({triggerName: 'sample_feed_trigger'})
+    const result = await feeds.create(feedParams)
     t.is(result.response.success, true)
-    return feeds.get(feedParams).then(getTesult => {
-      t.is(getTesult.response.success, true)
-      return feeds.delete(feedParams).then(feedResult => {
-        t.is(feedResult.response.success, true)
-        return feeds.update(feedParams).then(() => {
-          t.is(feedResult.response.success, false) // alarms does not 
currently support update, hence should fail
-          return triggers.delete({triggerName: 'sample_feed_trigger'}).then(() 
=> {
-            t.pass()
-          })
-        }).catch(errors)
-      }).catch(errors)
-    }).catch(errors)
-  }).catch(errors)
+
+    const getResult = await feeds.get(feedParams)
+    t.is(getResult.response.success, true)
+
+    feedParams.cron = '* * * * * *'
+    const updateResult = await feeds.update(feedParams)
+    t.is(updateResult.response.success, true)
+
+    const deleteResult = await feeds.delete(feedParams)
+    t.is(deleteResult.response.success, true)
+
+    await triggers.delete({triggerName: 'sample_feed_trigger'})
+    t.pass()
+  } catch (err) {
+    console.log(err)
+    t.fail()
+  }
 })