APIC-41 Skip token tests if env vars not present (#110)

Author: eddiezane

CONTRIBUTING.md

@@ -17,12 +17,7 @@ This will create three folders:
 * `npm run watch` - this will do an initial build, then build on any changes to *src*
 * `npm run test` - test JS files in the */spec* folder
   * tests require the following environment variables to be set:
-    * `API_KEY`
-    * `CLIENT_ID`
-    * `CLIENT_SECRET`
-    * `APP_ID`
-    * `USER_ID`
-    * `SESSION_TOKEN`
+    * `CLARIFAI_API_KEY`
 * `npm run clean` - empty and remove the folders created on build
 
 #### Command line optional params

spec/api-key-spec.js

@@ -4,13 +4,14 @@ const {sampleImages} = require('./test-data');
 
 describe('API key', () => {
   it('can initialize an app with an api key', done => {
-    const anApp = new Clarifai.App({apiKey: process.env.API_KEY});
-    expect(anApp._config.apiKey).toEqual(process.env.API_KEY);
+    expect(process.env.CLARIFAI_API_KEY).toBeDefined();
+    const anApp = new Clarifai.App({apiKey: process.env.CLARIFAI_API_KEY});
+    expect(anApp._config.apiKey).toEqual(process.env.CLARIFAI_API_KEY);
     done();
   });
 
   it('can make calls with an api key', done => {
-    const anApp = new Clarifai.App({apiKey: process.env.API_KEY});
+    const anApp = new Clarifai.App({apiKey: process.env.CLARIFAI_API_KEY});
     anApp.models.predict(Clarifai.GENERAL_MODEL, [
       {
         'url': sampleImages[0]

spec/concepts-spec.js

@@ -17,14 +17,10 @@ describe('Concepts', () => {
   ];
 
   beforeAll(() => {
-    app = new Clarifai.App(
-      process.env.CLIENT_ID,
-      process.env.CLIENT_SECRET,
-      {
-        apiEndpoint: process.env.API_ENDPOINT,
-        token: process.env.CLIENT_TOKEN
-      }
-    );
+    app = new Clarifai.App({
+      apiKey: process.env.CLARIFAI_API_KEY,
+      apiEndpoint: process.env.API_ENDPOINT
+    });
   });
 
   it('creates concepts given a list of strings', done => {

spec/delete-spec.js

@@ -13,14 +13,10 @@ let testModelId = 'vroom-vroom' + d;
 describe('Delete Resources', () => {
 
   beforeAll(done => {
-    app = new Clarifai.App(
-      process.env.CLIENT_ID,
-      process.env.CLIENT_SECRET,
-      {
-        apiEndpoint: process.env.API_ENDPOINT,
-        token: process.env.CLIENT_TOKEN
-      }
-    );
+    app = new Clarifai.App({
+      apiKey: process.env.CLARIFAI_API_KEY,
+      apiEndpoint: process.env.API_ENDPOINT,
+    });
 
     app.inputs.create([
       {

spec/inputs-search-spec.js

@@ -20,14 +20,10 @@ let lastCount;
 describe('Inputs', () => {
 
   beforeAll(done => {
-    app = new Clarifai.App(
-      process.env.CLIENT_ID,
-      process.env.CLIENT_SECRET,
-      {
-        apiEndpoint: process.env.API_ENDPOINT,
-        token: process.env.CLIENT_TOKEN
-      }
-    );
+    app = new Clarifai.App({
+      apiKey: process.env.CLARIFAI_API_KEY,
+      apiEndpoint: process.env.API_ENDPOINT
+    });
 
     app.inputs.delete()
       .then(response => {
@@ -560,7 +556,7 @@ describe('Search', () => {
 
       app.inputs.delete()
         .then(() => {
-          return app.models.delete(); 
+          return app.models.delete();
         })
         .then(response => {
           expect(response.status).toBeDefined();

spec/models-spec.js

@@ -24,14 +24,10 @@ describe('Models', () => {
   var testModel;
 
   beforeAll(() => {
-    app = new Clarifai.App(
-      process.env.CLIENT_ID,
-      process.env.CLIENT_SECRET,
-      {
-        apiEndpoint: process.env.API_ENDPOINT,
-        token: process.env.CLIENT_TOKEN
-      }
-    );
+    app = new Clarifai.App({
+      apiKey: process.env.CLARIFAI_API_KEY,
+      apiEndpoint: process.env.API_ENDPOINT
+    });
   });
 
   it('Creates a new model', done => {

spec/options-spec.js

@@ -2,6 +2,14 @@ const Clarifai = require('./../src');
 
 describe('Options', () => {
   it('can initialize an app with just the options object', done => {
+    // Skip test if these aren't defined
+    if (
+      !process.env.CLIENT_ID ||
+      !process.env.CLIENT_SECRET
+    ) {
+      return pending('CLIENT_ID or CLIENT_SECRET not defined');
+    }
+
     const app = new Clarifai.App({clientId: process.env.CLIENT_ID, clientSecret: process.env.CLIENT_SECRET});
     expect(app._config.clientId).toEqual(process.env.CLIENT_ID);
     done();

spec/session-token-spec.js

@@ -5,6 +5,15 @@ const {sampleImages} = require('./test-data');
 describe('Session Token', () => {
 
   it('can initialize an app with a session token, app id and user id', done => {
+    // Skip test if these aren't defined
+    if (
+      !process.env.SESSION_TOKEN ||
+      !process.env.APP_ID ||
+      !process.env.USER_ID
+    ) {
+      return pending('SESSION_TOKEN, APP_ID, or USER_ID not defined');
+    }
+
     const anApp = new Clarifai.App({
       sessionToken: process.env.SESSION_TOKEN,
       appId: process.env.APP_ID,
@@ -15,6 +24,15 @@ describe('Session Token', () => {
   });
 
   it('can make calls with a session token', done => {
+    // Skip test if these aren't defined
+    if (
+      !process.env.SESSION_TOKEN ||
+      !process.env.CLARIFAI_USER_APP_ID ||
+      !process.env.USER_ID
+    ) {
+      return pending('SESSION_TOKEN, CLARIFAI_USER_APP_ID, or USER_ID not defined');
+    }
+
     const anApp = new Clarifai.App({
       sessionToken: process.env.SESSION_TOKEN,
       appId: process.env.CLARIFAI_USER_APP_ID,

spec/workflow-spec.js

@@ -8,15 +8,11 @@ let testWorkflowId;
 
 describe('Workflow', () => {
   beforeAll(function() {
-    app = new Clarifai.App(
-      process.env.CLIENT_ID,
-      process.env.CLIENT_SECRET,
-      {
-        apiEndpoint: process.env.API_ENDPOINT,
-        token: process.env.CLIENT_TOKEN
-      }
-    );
-  })
+    app = new Clarifai.App({
+      apiKey: process.env.CLARIFAI_API_KEY,
+      apiEndpoint: process.env.API_ENDPOINT
+    });
+  });
 
   it('Call given workflow id with one input', done => {
     testWorkflowId = 'big-bang' + Date.now();