Refactor based on PR

commercetools · Aug 26, 2016 · 6c34f70 · 6c34f70
1 parent fde65e2
commit 6c34f70
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/src/coffee/product-type-import.coffee b/src/coffee/product-type-import.coffee
@@ -46,11 +46,10 @@ class ProductTypeImporter
     else
       credentialsPromise = ProjectCredentialsConfig.create()
       .then (credentials) ->
-        Promise.resolve
-          config: credentials.enrichCredentials
-            project_key: argv.projectKey
-            client_id: argv.clientId
-            client_secret: argv.clientSecret
+        config: credentials.enrichCredentials
+          project_key: argv.projectKey
+          client_id: argv.clientId
+          client_secret: argv.clientSecret
 
     credentialsPromise.then (credentials) ->
       options = _.extend credentials,
@@ -64,18 +63,15 @@ class ProductTypeImporter
         options.rejectUnauthorized = false
       options.oauth_protocol = argv.sphereAuthProtocol if argv.sphereAuthProtocol
 
-      config =
-        sphereClientConfig: options
-
-      Promise.resolve config
+      sphereClientConfig: options
 
   ###
   Create sphere product import class
   ###
   _ensureProductTypeImporter: (argv, logger) ->
     @_ensureCredentials argv
-    .then (credentials) ->
-      new ProductTypeImport.default(logger, credentials)
+    .then (credentials) =>
+      @sphereImporter = new ProductTypeImport.default(logger, credentials)
 
   ###
   Import product types using sphere product import tool

diff --git a/src/spec/product-type-importer.spec.coffee b/src/spec/product-type-importer.spec.coffee
@@ -107,4 +107,7 @@ describe 'ProductTypeImporter', ->
     .then ->
       done "Importer wrong product type"
     .catch ->
-      done()
+      sphereClient.productTypes.fetch()
+      .then (res) ->
+        expect(res.body.results.length).toEqual 0
+        done()