Merge pull request mulesoft#183 from mseashor/master

jcenturion · jcenturion · commit 45dfb8250763 · 2015-10-15T16:03:12.000-03:00
Don't unset credentials when switching endpoints
diff --git a/.travis.yml b/.travis.yml
@@ -11,7 +11,8 @@ before_script:
   - node_modules/grunt-protractor-runner/node_modules/protractor/bin/webdriver-manager update
 before_install:
   - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"
+  #startup Xvfb manually to increase display size.  Prevents selenium issues.
+  - "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16" 
 after_success:
   - echo -n $id_rsa_{00..30} >> ~/.ssh/id_rsa_base64
   - base64 --decode --ignore-garbage ~/.ssh/id_rsa_base64 > ~/.ssh/id_rsa
diff --git a/dist/scripts/api-console-vendor.min.js b/dist/scripts/api-console-vendor.min.js
diff --git a/dist/scripts/api-console.js b/dist/scripts/api-console.js
@@ -472,7 +472,6 @@
           $scope.showMoreEnable           = true;
           $scope.showSpinner              = false;
           $scope.securitySchemes          = $scope.methodInfo.securitySchemes();
-          $scope.credentials              = {};
           $scope.traits                   = $scope.readTraits($scope.methodInfo.is);
           $scope.context.customParameters = { headers: [], queryParameters: [] };
           $scope.currentBodySelected      = methodInfo.body ? Object.keys(methodInfo.body)[0] : 'application/json';
@@ -1752,6 +1751,7 @@
         $scope.disableTitle           = false;
         $scope.resourcesCollapsed     = false;
         $scope.documentationCollapsed = false;
+        $scope.credentials = {};
 
         if ($attrs.hasOwnProperty('singleView')) {
           $scope.singleView = true;
diff --git a/dist/scripts/api-console.min.js b/dist/scripts/api-console.min.js
diff --git a/src/app/directives/method-list.js b/src/app/directives/method-list.js
@@ -112,7 +112,6 @@
           $scope.showMoreEnable           = true;
           $scope.showSpinner              = false;
           $scope.securitySchemes          = $scope.methodInfo.securitySchemes();
-          $scope.credentials              = {};
           $scope.traits                   = $scope.readTraits($scope.methodInfo.is);
           $scope.context.customParameters = { headers: [], queryParameters: [] };
           $scope.currentBodySelected      = methodInfo.body ? Object.keys(methodInfo.body)[0] : 'application/json';
diff --git a/src/app/resources/resources.js b/src/app/resources/resources.js
@@ -14,6 +14,7 @@
         $scope.disableTitle           = false;
         $scope.resourcesCollapsed     = false;
         $scope.documentationCollapsed = false;
+        $scope.credentials = {};
 
         if ($attrs.hasOwnProperty('singleView')) {
           $scope.singleView = true;
diff --git a/test/regression/assertions/resource.js b/test/regression/assertions/resource.js
@@ -50,6 +50,37 @@ function Resource (poName) {
       }
     });
   };
+
+  this.ifCredentialsUpdateBetweenResources = function () {
+    var resourcesGetButton= this.po.getMethodBtn(0, 0);
+    var pageObject = this.po;
+
+    var userText = 'test';
+    var passwordText = 'pass';
+
+    //click Get on /resources and set the user/pass
+    resourcesGetButton.click();
+
+    var username = pageObject.getUsernameField();
+    username.sendKeys(userText);
+    var password = pageObject.getPasswordField();
+    password.sendKeys(passwordText);
+
+    //close button to ensure 'resource2' is on screen.
+    var closeButton = pageObject.getCloseBtn(0);
+    closeButton.click();
+
+    var resources2GetButton = pageObject.getMethodBtn(1, 0);
+
+    //click Get on /resources2 and ensure user/pass match
+    resources2GetButton.click();
+
+    var username2 = pageObject.getUsernameField();
+    expect(username2.getAttribute('value')).toBe(userText);
+    var password2 = pageObject.getPasswordField();
+    expect(password2.getAttribute('value')).toBe(passwordText);
+
+  };
 }
 
 
diff --git a/test/regression/assets/directive-security-schemes-basic.html b/test/regression/assets/directive-security-schemes-basic.html
@@ -0,0 +1,17 @@
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <title>API Console</title>
+  <link href="styles/api-console-light-theme.css" rel="stylesheet" class="theme">
+</head>
+<body ng-app="ramlConsoleApp" ng-cloak class="raml-console-body">
+  <raml-console src="raml/security-schemes-basic.raml"></raml-console>
+  <script src="scripts/api-console-vendor.js"></script>
+  <script src="scripts/api-console.js"></script>
+  <script type="text/javascript">
+    $.noConflict();
+  </script>
+</body>
+</html>
diff --git a/test/regression/assets/raml/security-schemes-basic.raml b/test/regression/assets/raml/security-schemes-basic.raml
@@ -0,0 +1,12 @@
+#%RAML 0.8
+title: My API
+baseUri: http://localhost:9000
+securitySchemes:
+  - basic:
+      type: Basic Authentication
+
+securedBy: [ basic ]
+/resources:
+ get:
+/resources2:
+ get:
diff --git a/test/regression/page_objects/resourcePO.js b/test/regression/page_objects/resourcePO.js
@@ -41,6 +41,17 @@ function ResourcesPO () {
   this.getSecuritySchemes = function (index) {
     return this.resources.get(index+1).all(by.tagName('option'));
   };
+  this.getUsernameField = function () {
+    return element(by.name('username'));
+  };
+  this.getPasswordField = function () {
+    return element(by.name('password'));
+  };
+  this.getCloseBtn = function (index) {
+    return this.resources.get(index+1).all(by.css('.raml-console-resource-close-btn'));
+  };
+
+
 }
 
 ResourcesPO.prototype = basePO;
diff --git a/test/regression/standalone/directiveSpec.js b/test/regression/standalone/directiveSpec.js
@@ -39,6 +39,16 @@ module.exports = function() {
     assert.ifShowingSecuritySchemes(0, 0, ['Anonymous', 'OAuth 2.0']);
   });
 
+  it('should be able to cache credentials between resources', function () {
+    // Arrange
+    var assert = assertions.create('resource');
+
+    // Act
+    browser.get('http://localhost:9000/directive-security-schemes-basic.html');
+    assert.ifCredentialsUpdateBetweenResources();
+  });
+
+
   it('should be able to diplay all HTTP methods', function () {
     // Arrange
     var assert = assertions.create('resource');
