merged promise/callback fix

XeroAPI · Mar 14, 2017 · 752f05a · 752f05a
2 parents c17877b + a73f23b
commit 752f05a
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/test/accountingtests.js b/test/accountingtests.js
@@ -80,6 +80,7 @@ describe('get access for public or partner application', function() {
             done();
         });
 
+<<<<<<< HEAD
         it('user gets a token and builds the url', function(done) {
 
             currentApp.getRequestToken(function(err, token, secret) {
@@ -99,6 +100,18 @@ describe('get access for public or partner application', function() {
                 }).catch(function(err) {
                     done(wrapError(err));
                 });
+=======
+        it('user gets a token and builds the url', function() {
+            return currentApp.getRequestToken()
+                .then(function(res) {
+                    requestToken = res.token;
+                    requestSecret = res.secret;
+                    authoriseUrl = currentApp.buildAuthorizeUrl(requestToken);
+                    console.log("URL: " + authoriseUrl);
+                    console.log("token: " + requestToken);
+                    console.log("secret: " + requestSecret);
+            });
+>>>>>>> a73f23b4dbadd275af13f98669ae2aca66cac448
         });
 
         describe('gets the request token from the url', function() {