Merge pull request #692 from appirio-tech/qa-integration

Qa integration

Author: nlitwin

README.md

@@ -58,6 +58,8 @@ Spec files live alongside the code they are testing. For example, in peer-review
 ## UI-Router and States
 See any *.routes.js file as an example.
 
+**Important:** Make sure the url in your routes files ends with a slash `/`
+
 ## Contributing
 
 ### Style Guide and Naming Conventions
@@ -78,9 +80,9 @@ Jade Files
 ```
     .wrapper
       h1 Lorem ipsum
-      
+
       p Sibling tag
-      
+
     .wrapper2
       p Child
 ```
@@ -99,7 +101,7 @@ SCSS Files
       height: 100px;
       width: 100px;
     }
-    
+
     .inside-box {
       font-size: 14px;
       @media screen and (min-width: 768px) {

app/community/members.controller.js

@@ -10,7 +10,7 @@
     ctrl.notSearch = true;
     ctrl.showing = 'list';
     ctrl.domain = CONSTANTS.domain;
-    ctrl.currentMonth = 'November 2015';
+    ctrl.currentMonth = 'December 2015';
     ctrl.memberLeaderboard = [];
     ctrl.copilots = [];
     CommunityDataService.getMembersData()

app/directives/badges/badge-tooltip.spec.js

@@ -6,14 +6,14 @@ describe('Badge Tooltip Directive', function() {
   var spotlightChallenge = mockData.getMockSpotlightChallenges()[0];
 
   beforeEach(function() {
-    bard.appModule('tcUIComponents');
+    bard.appModule('topcoder');
     bard.inject(this, '$compile', '$rootScope');
     scope = $rootScope.$new();
   });
 
   bard.verifyNoOutstandingHttpRequests();
 
-  xdescribe('Badge Tooltip', function() {
+  describe('Badge Tooltip', function() {
     var tooltip;
 
     beforeEach(function() {
@@ -89,5 +89,18 @@ describe('Badge Tooltip Directive', function() {
       expect(dataDiv).not.to.null;
       expect(dataDiv.hasClass('ng-hide')).to.equal(true);
     });
+
+    it('should trigger mouseenter handler ', function() {
+      tooltip.trigger('mouseenter');
+      var tooltipElement = tooltip.children(0);
+      expect(tooltipElement.css('z-index')).to.equal('2000');
+      expect(tooltip.isolateScope().hide).to.equal(false);
+    });
+
+    it('should trigger mouseleave handler ', function() {
+      tooltip.trigger('mouseleave');
+      tooltipElement = tooltip.children(0);
+      expect(tooltip.isolateScope().hide).to.equal(true);
+    });
   });
 });

app/directives/challenge-tile/challenge-tile.directive.jade

@@ -2,80 +2,75 @@
   .active-challenge(ng-show="challenge.status === 'ACTIVE'")
 
     header
-      .top
-        a.name(ng-href="{{challenge|challengeLinks:'detail'}}") #[span {{challenge.name}}]
+      a.name(ng-href="{{challenge|challengeLinks:'detail'}}", title="{{challenge.name}}") #[span {{challenge.name}}]
 
-        .challenge-track
-
-        p.subtrack-color {{challenge.subTrack | underscoreStrip}}
+      p.subtrack-color {{challenge.subTrack | underscoreStrip}}
 
       challenge-links(challenge="challenge", view="'tile'")
+    .challenge-card__bottom.challenge-card__bottom--active
+      .challenge-details
+        p.currentPhase {{challenge.userCurrentPhase}}
 
-    .challenge-details
-      p.currentPhase {{challenge.userCurrentPhase}}
-
-      .challenge-calendar(ng-show="challenge.userCurrentPhaseEndTime")
-        p.ends-in Ends In
-        p.time-remaining {{challenge.userCurrentPhaseEndTime[0]}}
-        p.unit-of-time {{challenge.userCurrentPhaseEndTime[1]}}
+        .challenge-calendar(ng-show="challenge.userCurrentPhaseEndTime")
+          p.ends-in Ends In
+          p.time-remaining {{challenge.userCurrentPhaseEndTime[0]}}
+          p.unit-of-time {{challenge.userCurrentPhaseEndTime[1]}}
 
-      .stalled-challenge(ng-hide="challenge.userCurrentPhaseEndTime") This challenge is currently paused.
+        .stalled-challenge(ng-hide="challenge.userCurrentPhaseEndTime") This challenge is currently paused.
 
-      .phase-action(ng-switch="challenge.userAction")
-        a.tc-btn.tc-btn-s.tc-btn-wide.tc-btn-ghost.submit(ng-switch-when="Submit", ng-href="{{challenge|challengeLinks:'detail'}}") Submit
+        .phase-action(ng-show="challenge.userAction", ng-switch="challenge.userAction")
+          a.tc-btn.tc-btn-s.tc-btn-wide.tc-btn-ghost.submit(ng-switch-when="Submit", ng-href="{{challenge|challengeLinks:'detail'}}") Submit
 
-        .submitted(ng-switch-when="Submitted") Submitted
+          .submitted(ng-switch-when="Submitted") Submitted
 
-        // TODO: Need styling and JS logic for this one
-        .registered(ng-switch-when="Registered") Registered
+          // TODO: Need styling and JS logic for this one
+          .registered(ng-switch-when="Registered") Registered
 
-    // Only show if not data science track
-    p.roles 
-      span(ng-hide="challenge.track === 'DATA_SCIENCE'") 
-        span Role:  
-        span {{challenge.userDetails.roles | listRoles}}
+      // Only show if not data science track
+      p.roles 
+        span(ng-hide="challenge.track === 'DATA_SCIENCE'") 
+          span Role:  
+          span {{challenge.userDetails.roles | listRoles}}
 
   .completed-challenge(
     ng-show="challenge.status === 'COMPLETED' || challenge.status === 'PAST'",
     ng-switch="challenge.track")
-    .challenge-track
 
     header
-      .top
-        a.name(ng-href="{{challenge|challengeLinks:'detail'}}") {{challenge.name}}
+      a.name(ng-href="{{challenge|challengeLinks:'detail'}}", title="{{challenge.name}}") {{challenge.name}}
 
-        p.subtrack-color {{challenge.subTrack | underscoreStrip}}
+      p.subtrack-color {{challenge.subTrack | underscoreStrip}}
 
       p.date-completed {{challenge.submissionEndDate | date : 'MMMM yyyy'}}
 
       .winner-ribbon(ng-show="challenge.wonFirst")
 
-    .challenge-details(ng-switch-when="DATA_SCIENCE", ng-switch="challenge.subTrack", ng-class="challenge.track")
+    .challenge-card__bottom.challenge-card__bottom--completed
+      .challenge-details(ng-switch-when="DATA_SCIENCE", ng-switch="challenge.subTrack", ng-class="challenge.track")
 
-      div
-        .marathon-score
-          p.score {{challenge.pointTotal || 0 }}
+        div
+          .marathon-score
+            p.score {{challenge.pointTotal || 0 }}
 
-          p Total Points
+            p Total Points
 
-    .challenge-details(ng-switch-when="DEVELOP")
-      dev-challenge-user-place(challenge="challenge", view="view")
+      .challenge-details(ng-switch-when="DEVELOP")
+        dev-challenge-user-place(challenge="challenge", view="view")
 
-    .challenge-details(ng-switch-when="DESIGN")
-      design-challenge-user-place(challenge="challenge", view="view")
+      .challenge-details(ng-switch-when="DESIGN")
+        design-challenge-user-place(challenge="challenge", view="view")
 
-    // Only show if not data science track
-    p.roles
-      span(ng-hide="challenge.track === 'DATA_SCIENCE'") 
-        span Role:  
-        span {{challenge.userDetails.roles | listRoles}}
+      // Only show if not data science track
+      p.roles
+        span(ng-hide="challenge.track === 'DATA_SCIENCE'") 
+          span Role:  
+          span {{challenge.userDetails.roles | listRoles}}
 
 .challenge.list-view(ng-show="view=='list'", ng-class="challenge.track")
   .active-challenge(ng-show="challenge.status === 'ACTIVE'")
-    .challenge-track
 
     header
-      a.name(ng-href="{{challenge|challengeLinks:'detail'}}") {{challenge.name}}
+      a.name(ng-href="{{challenge|challengeLinks:'detail'}}", title="{{challenge.name}}") {{challenge.name}}
 
       p.subtrack-color {{challenge.subTrack | underscoreStrip}}
 
@@ -102,22 +97,20 @@
   .completed-challenge(
     ng-show="challenge.status === 'COMPLETED' || challenge.status === 'PAST'",
     ng-switch="challenge.track")
-    .challenge-track
 
     header
-      a.name(ng-href="{{challenge|challengeLinks:'detail'}}") {{challenge.name}}
+      a.name(ng-href="{{challenge|challengeLinks:'detail'}}", title="{{challenge.name}}") {{challenge.name}}
 
       p.subtrack-color {{challenge.subTrack | underscoreStrip}}
 
       p.roles(ng-hide="challenge.track === 'DATA_SCIENCE'") #[span Role: ] #[span {{challenge.userDetails.roles | listRoles}}]
 
     .challenge-details(ng-switch-when="DATA_SCIENCE", ng-switch="challenge.subTrack", ng-class="challenge.track")
 
-      div
-        .marathon-score
-          p.score {{challenge.pointTotal || 0 }}
+      .marathon-score
+        p.score {{challenge.pointTotal || 0 }}
 
-          p Total Points
+        p Total Points
 
     .challenge-details(ng-switch-when="DEVELOP")
       dev-challenge-user-place(challenge="challenge", view="view")

app/directives/challenge-user-place/dev-challenge-user-place.directive.jade

@@ -4,7 +4,7 @@
     p.place(ng-show="challenge.userStatus === 'PASSED_SCREENING'") Passed Screening
     p.place(ng-show="challenge.userStatus === 'COMPLETED'") COMPLETED
 
-  .challenge-score(ng-class="{hidden: challenge.userStatus !== 'PASSED_REVIEW'}")
+  .challenge-score(ng-hide="challenge.userStatus !== 'PASSED_REVIEW'")
     p.score {{challenge.userDetails.submissionReviewScore/100 | percentage}}
 
     p Review Score

app/directives/page-state-header/page-state-header.directive.js

@@ -4,7 +4,7 @@
   angular.module('tcUIComponents').directive('pageStateHeader', function() {
     return {
       restrict: 'E',
-      templateUrl: 'directives/page-state-header/page-state-header.directive.html',
+      templateUrl: 'directives/page-state-header/page-state-header.html',
       transclude: true,
       scope: {
         handle: '@',

app/directives/page-state-header/page-state-header.directive.jade renamed to app/directives/page-state-header/page-state-header.jade

@@ -1,7 +1,7 @@
 .page-state-header
   header
     .page-info
-      h1 {{pageTitle}}
+      h1 {{pageTitle | track}}
 
       div(ng-transclude)
 

app/directives/tc-file-input/tc-file-input.directive.js

@@ -28,8 +28,8 @@
         var fileInput = $(element[0]).find('.none');
         var fileNameInput = $(element[0]).find('input[type=text]');
 
-        fileInput.bind('change', function() {
-          var file = fileInput[0].files[0];
+        fileInput.bind('change', function(event) {
+          var file = event.target.files[0];
 
           // About 1 in 20 times, the file is undefined (must be race condition)
           // Return early in this case so no errors are thrown

app/directives/tc-file-input/tc-file-input.jade

@@ -2,10 +2,11 @@
   label.tc-label {{labelText}}
     span.lowercase(ng-if="showFileType") {{ ' *(.' + fileType + ')'}}
 
-    span.tc-label__mandatory.lowercase(ng-if="mandatory") #[span *]mandatory
-
 .tc-file-field__inputs
-  input.tc-file-field__input(type="text", placeholder="{{placeholder}}", disabled)
+  .tc-label__wrapper
+    input.tc-file-field__input(type="text", placeholder="{{placeholder}}", disabled)
+
+    span.tc-label__asterisk.lowercase(ng-if="mandatory") #[span *]mandatory
 
   button.tc-btn(ng-click="selectFile()") {{buttonText}}