Merge commit 'e6ccfec5b09a0b300f38aab48d82fa343999e731' into HEAD

Author: Jenkins Continuous Integration Server

app/account/register/register.jade

@@ -83,7 +83,7 @@
       p.form-error(ng-message="required") Please enter an email address.
 
     .validation-bar(ng-class="{ 'success-bar': (vm.registerForm.password.$valid) }")
-      toggle-password-with-tips(ng-if="!vm.isSocialRegistration")
+      toggle-password-with-tips(ng-if="!vm.isSocialRegistration", placeholder="Create Password")
 
       .tips.password-tips(ng-show="vm.passwordFocus")
         .arrow

app/directives/account/toggle-password-with-tips/toggle-password-with-tips.directive.js

@@ -11,7 +11,7 @@
       link: function(scope, element, attrs, formController) {
         var vm = scope.vm;
         vm.passwordField = formController.password;
-        vm.defaultPlaceholder = attrs.placeholder || 'Pick a new password';
+        vm.defaultPlaceholder = attrs.placeholder || 'Create new password';
         vm.placeholder = vm.defaultPlaceholder;
         vm.password = '';
 
@@ -41,6 +41,7 @@
           if (relatedTarget.attr('type') === 'checkbox' && relatedTarget.attr('id') === 'passwordCheckbox') {
             vm.passwordFocus = true;
             vm.placeholder = '';
+            passwordInput.focus();
           } else {
             // If you are blurring from the password input and clicking anywhere but the checkbox
             vm.passwordFocus = false;

app/directives/account/toggle-password-with-tips/toggle-password-with-tips.jade

@@ -1,8 +1,7 @@
 input#password-input(
   ng-model="vm.password",
   ng-model-options="{allowInvalid: true}",
-
-  focus-on="focusOnInput",
+  
   ng-focus="vm.onFocus($event)",
   ng-blur="vm.onBlur($event)",
 
@@ -17,4 +16,4 @@ input#password-input(
   has-symbol-or-number,
   required)
 
-label(ng-show="vm.passwordFocus || vm.passwordField.$dirty") #[input(type="checkbox", id="passwordCheckbox", ng-model="focusOnInput", ng-change="vm.toggleInputType()")] Show
+label #[input(type="checkbox", id="passwordCheckbox", ng-model="focusOnInput", ng-change="vm.toggleInputType()")] Show

app/directives/account/toggle-password-with-tips/toggle-password-with-tips.spec.js

@@ -9,7 +9,145 @@ describe('Toggle Password With Tips Directive', function() {
     bard.appModule('topcoder');
     bard.inject(this, '$compile', '$rootScope');
     scope = $rootScope.$new();
+    scope.vm = {};
   });
 
   bard.verifyNoOutstandingHttpRequests();
+
+  describe('Toggle Password Directive', function() {
+    var togglePassword, controller, formController, passwordFormFieldSpy;
+
+    beforeEach(function() {
+      var form = angular.element('<form><toggle-password-with-tips /></form>)');
+      element = form.find('toggle-password-with-tips');
+      var formElement = $compile(form)(scope);
+      scope.$digest();
+
+      // controller = element.controller('togglePassword');
+      formController = form.controller('form');
+      passwordFormFieldSpy = sinon.spy(formController.password, '$setPristine');
+    });
+
+    afterEach(function() {
+      // do nohting
+    });
+
+    it('should have password default placeholder', function() {
+      expect(scope.vm.defaultPlaceholder).to.exist.to.equal('Create new password');
+      expect(scope.vm.placeholder).to.exist.to.equal('Create new password');
+    });
+
+    it('should not have focus class', function() {
+      expect(element.hasClass('focus')).to.be.false;
+    });
+
+    it('should trigger click handler ', function() {
+      var mockFocus = sinon.spy(element.find('input')[0], 'focus');
+      element.trigger('click');
+      expect(mockFocus).to.be.calledOnce;
+    });
+
+    it('should trigger focus handler ', function() {
+      var pwsIntputElement = angular.element(element.find('input')[0]);
+      pwsIntputElement.triggerHandler('focus');
+      expect(element.hasClass('focus')).to.be.true;
+    });
+
+    it('should trigger blur handler with form field pristine ', function() {
+      var pwsIntputElement = angular.element(element.find('input')[0]);
+      // focus it first
+      pwsIntputElement.triggerHandler('focus');
+      // verifies if focus class is added
+      expect(element.hasClass('focus')).to.be.true;
+      // now blurs from it
+      pwsIntputElement.triggerHandler('blur');
+      // focus class should not be there
+      expect(element.hasClass('focus')).to.be.false;
+      // password field's setPristine method should be called once because currentPassword is empty
+      expect(passwordFormFieldSpy).to.be.calledOnce;
+    });
+
+    it('should trigger blur handler without form field pristine ', function() {
+      scope.vm.password = 'some-password';
+      scope.$digest();
+      var pwsIntputElement = angular.element(element.find('input')[0]);
+      // focus it first
+      pwsIntputElement.triggerHandler('focus');
+      // verifies if focus class is added
+      expect(element.hasClass('focus')).to.be.true;
+      // now blurs from it
+      pwsIntputElement.triggerHandler('blur');
+      // focus class should not be there
+      expect(element.hasClass('focus')).to.be.false;
+      // password field's setPristine method should not be called because currentPassword is non-empty
+      expect(passwordFormFieldSpy).not.to.be.called;
+    });
+
+    it('should keep focus on password field on blurring to checkbox ', function() {
+
+      var pwsIntputElement = angular.element(element.find('input')[0]);
+      // focus it first
+      pwsIntputElement.triggerHandler('focus');
+      // verifies if focus class is added
+      expect(element.hasClass('focus')).to.be.true;
+      // now blurs from it
+
+      var e = jQuery.Event("blur");
+      e.relatedTarget = {
+        getAttribute: function(name) {
+          if (name === 'type') return 'checkbox';
+          if (name === 'id') return 'passwordCheckbox';
+        }
+      };
+      //mock focus event
+      var mockFocus = sinon.spy(element.find('input')[0], 'focus');
+      // trigger event
+      pwsIntputElement.trigger(e);
+
+      // focus should be called once
+      expect(mockFocus).to.be.calledOnce;
+      // password field placeholde should be empty
+      expect(scope.vm.placeholder).to.exist.to.equal('');
+    });
+
+    it('should change type of input field to be text ', function() {
+      var pwsIntputElement = angular.element(element.find('input')[0]);
+      var checkbox = angular.element(element.find('input')[1]);
+      // before clicking on checkbox, it should have password type
+      expect(pwsIntputElement.attr('type')).to.equal('password');
+      checkbox.trigger('click');
+      // after clicking on checkbox, it should have text type
+      expect(pwsIntputElement.attr('type')).to.equal('text');
+    });
+
+    it('should change type of input field to be password ', function() {
+      var pwsIntputElement = angular.element(element.find('input')[0]);
+      var checkbox = angular.element(element.find('input')[1]);
+      // before clicking on checkbox, it should have password type
+      expect(pwsIntputElement.attr('type')).to.equal('password');
+      checkbox.trigger('click');
+      // after clicking on checkbox, it should have text type
+      expect(pwsIntputElement.attr('type')).to.equal('text');
+      // click again to uncheck the checkbox
+      checkbox.trigger('click');
+      // after unchecking the checkbox, it should have password type
+      expect(pwsIntputElement.attr('type')).to.equal('password');
+    });
+
+    it('should trigger keyup handler with enter/return key ', function() {
+      var mockBlur = sinon.spy(element.find('input')[0], 'blur');
+      var e = jQuery.Event("keyup");
+      e.keyCode = 13;
+      element.trigger(e);
+      expect(mockBlur).to.be.calledOnce;
+    });
+
+    it('should NOT trigger keyup handler with non enter/return key ', function() {
+      var mockBlur = sinon.spy(element.find('input')[0], 'blur');
+      var e = jQuery.Event("keyup");
+      e.keyCode = 14;
+      element.trigger(e);
+      expect(mockBlur).not.to.be.called;
+    });
+  });
 });

app/directives/account/toggle-password/toggle-password.spec.js

@@ -1,5 +1,5 @@
 /* jshint -W117, -W030 */
-xdescribe('Toggle Password Directive', function() {
+describe('Toggle Password Directive', function() {
   var scope;
   var element;
 

app/services/userStats.service.js

@@ -165,42 +165,42 @@
     function mapReliability(subTrack) {
       var reliabilityMapping = {
         'DESIGN': 1,
-        'DEVELOPMENT': 1,
-        'TESTING_COMPETITION': 1,
-        'SPECIFICATION': 2,
-        'ARCHITECTURE': 2,
-        'COMPONENT_PRODUCTION': 2,
-        'BUG_HUNT': 2,
-        'DEPLOYMENT': 2,
-        'SECURITY': 2,
-        'PROCESS': 2,
-        'TEST_SUITES': 2,
-        'ASSEMBLY_COMPETITION': 2,
-        'LEGACY': 2,
-        'BANNERS_OR_ICONS': 3,
-        'WEB_DESIGN': 3,
-        'WIREFRAMES': 3,
-        'UI_PROTOTYPE_COMPETITION': 2,
-        'LOGO_DESIGN': 3,
-        'PRINT_OR_PRESENTATION': 3,
-        'CONCEPTUALIZATION': 2,
-        'RIA_BUILD_COMPETITION': 2,
-        'RIA_COMPONENT_COMPETITION': 2,
-        'TEST_SCENARIOS': 2,
-        'SPEC_REVIEW': 2,
-        'GENERIC_SCORECARDS': 4,
-        'COPILOT_POSTING': 2,
-        'CONTENT_CREATION': 2,
-        'WIDGET_OR_MOBILE_SCREEN_DESIGN': 3,
-        'FRONT_END_FLASH': 3,
-        'APPLICATION_FRONT_END_DESIGN': 3,
-        'STUDIO_OTHER': 3,
-        'IDEA_GENERATION': 3,
-        'REPORTING': 2,
-        'MARATHON_MATCH': 2,
-        'FIRST_2_FINISH': 2,
-        'CODE': 2,
-        'DESIGN_FIRST_2_FINISH': 3
+        'DEVELOPMENT': 2,
+        'TESTING_COMPETITION': 5,
+        'SPECIFICATION': 6,
+        'ARCHITECTURE': 7,
+        'COMPONENT_PRODUCTION': 8,
+        'BUG_HUNT': 9,
+        'DEPLOYMENT': 10,
+        'SECURITY': 11,
+        'PROCESS': 12,
+        'TEST_SUITES': 13,
+        'ASSEMBLY_COMPETITION': 14,
+        'LEGACY': 15,
+        'BANNERS_OR_ICONS': 16,
+        'WEB_DESIGN': 17,
+        'WIREFRAMES': 18,
+        'UI_PROTOTYPE_COMPETITION': 19,
+        'LOGO_DESIGN': 20,
+        'PRINT_OR_PRESENTATION': 21,
+        'CONCEPTUALIZATION': 23,
+        'RIA_BUILD_COMPETITION': 24,
+        'RIA_COMPONENT_COMPETITION': 25,
+        'TEST_SCENARIOS': 26,
+        'SPEC_REVIEW': 27,
+        'GENERIC_SCORECARDS': 28,
+        'COPILOT_POSTING': 29,
+        'CONTENT_CREATION': 35,
+        'WIDGET_OR_MOBILE_SCREEN_DESIGN': 30,
+        'FRONT_END_FLASH': 31,
+        'APPLICATION_FRONT_END_DESIGN': 32,
+        'STUDIO_OTHER': 34,
+        'IDEA_GENERATION': 22,
+        'REPORTING': 36,
+        'MARATHON_MATCH': 37,
+        'FIRST_2_FINISH': 38,
+        'CODE': 39,
+        'DESIGN_FIRST_2_FINISH': 40
       };
 
       return reliabilityMapping[subTrack] || 2;

app/services/userStats.service.spec.js

@@ -384,54 +384,44 @@ describe('User Stats Service', function() {
 
   describe('mapReliability ', function() {
     it('should map each subtrack to correct project type ', function() {
-      var pt1 = ['DESIGN', 'DEVELOPMENT', 'TESTING_COMPETITION'];
-      var pt2 = [
-        'SPECIFICATION',
-        'ARCHITECTURE',
-        'COMPONENT_PRODUCTION',
-        'BUG_HUNT', 'DEPLOYMENT',
-        'SECURITY', 'PROCESS',
-        'TEST_SUITES',
-        'ASSEMBLY_COMPETITION',
-        'LEGACY',
-        'UI_PROTOTYPE_COMPETITION',
-        'CONCEPTUALIZATION',
-        'RIA_BUILD_COMPETITION',
-        'RIA_COMPONENT_COMPETITION',
-        'TEST_SCENARIOS',
-        'SPEC_REVIEW',
-        'COPILOT_POSTING',
-        'CONTENT_CREATION',
-        'REPORTING',
-        'MARATHON_MATCH',
-        'FIRST_2_FINISH',
-        'CODE'
-      ];
-      var pt3 = [
-        'BANNERS_OR_ICONS',
-        'WEB_DESIGN',
-        'WIREFRAMES',
-        'LOGO_DESIGN',
-        'PRINT_OR_PRESENTATION',
-        'DESIGN_FIRST_2_FINISH',
-        'WIDGET_OR_MOBILE_SCREEN_DESIGN',
-        'FRONT_END_FLASH',
-        'APPLICATION_FRONT_END_DESIGN',
-        'STUDIO_OTHER',
-        'IDEA_GENERATION'];
-      var pt4 = ['GENERIC_SCORECARDS'];
-      pt1.forEach(function(subTrack) {
-        expect(UserStatsService.mapReliability(subTrack)).to.equal(1);
-      });
-      pt2.forEach(function(subTrack) {
-        expect(UserStatsService.mapReliability(subTrack)).to.equal(2);
-      });
-      pt3.forEach(function(subTrack) {
-        expect(UserStatsService.mapReliability(subTrack)).to.equal(3);
-      });
-      pt4.forEach(function(subTrack) {
-        expect(UserStatsService.mapReliability(subTrack)).to.equal(4);
-      });
+      expect(UserStatsService.mapReliability('DESIGN')).to.equal(1);
+      expect(UserStatsService.mapReliability('DEVELOPMENT')).to.equal(2);
+      expect(UserStatsService.mapReliability('TESTING_COMPETITION')).to.equal(5);
+      expect(UserStatsService.mapReliability('SPECIFICATION')).to.equal(6);
+      expect(UserStatsService.mapReliability('ARCHITECTURE')).to.equal(7);
+      expect(UserStatsService.mapReliability('COMPONENT_PRODUCTION')).to.equal(8);
+      expect(UserStatsService.mapReliability('BUG_HUNT')).to.equal(9);
+      expect(UserStatsService.mapReliability('DEPLOYMENT')).to.equal(10);
+      expect(UserStatsService.mapReliability('SECURITY')).to.equal(11);
+      expect(UserStatsService.mapReliability('PROCESS')).to.equal(12);
+      expect(UserStatsService.mapReliability('TEST_SUITES')).to.equal(13);
+      expect(UserStatsService.mapReliability('ASSEMBLY_COMPETITION')).to.equal(14);
+      expect(UserStatsService.mapReliability('LEGACY')).to.equal(15);
+      expect(UserStatsService.mapReliability('BANNERS_OR_ICONS')).to.equal(16);
+      expect(UserStatsService.mapReliability('WEB_DESIGN')).to.equal(17);
+      expect(UserStatsService.mapReliability('WIREFRAMES')).to.equal(18);
+      expect(UserStatsService.mapReliability('UI_PROTOTYPE_COMPETITION')).to.equal(19);
+      expect(UserStatsService.mapReliability('LOGO_DESIGN')).to.equal(20);
+      expect(UserStatsService.mapReliability('PRINT_OR_PRESENTATION')).to.equal(21);
+      expect(UserStatsService.mapReliability('IDEA_GENERATION')).to.equal(22);
+      expect(UserStatsService.mapReliability('CONCEPTUALIZATION')).to.equal(23);
+      expect(UserStatsService.mapReliability('RIA_BUILD_COMPETITION')).to.equal(24);
+      expect(UserStatsService.mapReliability('RIA_COMPONENT_COMPETITION')).to.equal(25);
+      expect(UserStatsService.mapReliability('TEST_SCENARIOS')).to.equal(26);
+      expect(UserStatsService.mapReliability('SPEC_REVIEW')).to.equal(27);
+      expect(UserStatsService.mapReliability('GENERIC_SCORECARDS')).to.equal(28);
+      expect(UserStatsService.mapReliability('COPILOT_POSTING')).to.equal(29);
+      expect(UserStatsService.mapReliability('WIDGET_OR_MOBILE_SCREEN_DESIGN')).to.equal(30);
+      expect(UserStatsService.mapReliability('FRONT_END_FLASH')).to.equal(31);
+      expect(UserStatsService.mapReliability('APPLICATION_FRONT_END_DESIGN')).to.equal(32);
+      expect(UserStatsService.mapReliability('STUDIO_OTHER')).to.equal(34);
+      expect(UserStatsService.mapReliability('CONTENT_CREATION')).to.equal(35);
+      expect(UserStatsService.mapReliability('REPORTING')).to.equal(36);
+      expect(UserStatsService.mapReliability('MARATHON_MATCH')).to.equal(37);
+      expect(UserStatsService.mapReliability('FIRST_2_FINISH')).to.equal(38);
+      expect(UserStatsService.mapReliability('CODE')).to.equal(39);
+      expect(UserStatsService.mapReliability('DESIGN_FIRST_2_FINISH')).to.equal(40);
+
       // for any other subtrack it should return 2
       expect(UserStatsService.mapReliability('unkown')).to.equal(2);
 

app/settings/account-info/account-info.jade

@@ -26,14 +26,14 @@
           .form-label New Password
 
           .validation-bar
-            toggle-password-with-tips.topcoder-input.password(placeholder="Pick a new password")
+            toggle-password-with-tips.topcoder-input.password(placeholder="Create new password")
 
             .tips.password-tips(ng-show="vm.passwordFocus")
               .arrow
 
-              h3 Password Tips:
+              //- h3 Password Tips:
 
-              p Your password must have:
+              H3 Your password must have:
 
               p(ng-class="{ 'has-length-between-range': (vm.newPasswordForm.password.$dirty && !vm.newPasswordForm.password.$error.minlength && !vm.newPasswordForm.password.$error.maxlength && !vm.newPasswordForm.password.$error.required) }") At least 8 characters
 

assets/css/directives/external-account.scss

@@ -4,7 +4,7 @@
   display: flex;
   flex-direction: column;
   align-items: center;
-  margin: 5px 0px 15px 0;
+  margin: 5px 20px 15px 0;
   cursor: pointer;
 
   &.connected {