Merge branch 'dev' into feature/quick-fixes-after-ga-release

* dev:
  Add test for tcsso token

Author: vikasrohit

app/services/tcAuth.service.spec.js

@@ -15,91 +15,83 @@ describe('TcAuthService', function() {
     expect(service).to.exist;
   });
 
-  describe("isAuthenticated", function() {
+  describe('isAuthenticated - invalid v2 token', function() {
     beforeEach(function() {
       bard.mockService(AuthTokenService, {
         getV2Token: function() {
-          return
+          return;
         },
         getV3Token: function() {
-          return "v3Token";
+          return 'v3Token';
         },
+        getTCSSOToken: function() {
+          return 'tcssoToken';
+        }
       });
     });
-    it('should return false for invalid v2token', function() {
+
+    it('should return false', function() {
       expect(service.isAuthenticated()).to.be.false;
     });
   });
 
-  describe("isAuthenticated", function() {
+  describe('isAuthenticated - invalid v3 token', function() {
     beforeEach(function() {
       bard.mockService(AuthTokenService, {
         getV2Token: function() {
-          return "v2Token";
+          return 'v2Token';
         },
         getV3Token: function() {
           return ;
         },
+        getTCSSOToken: function() {
+          return 'tcssoToken';
+        }
       });
     });
-    it('should return false for invalid v3token', function() {
+
+    it('should return false', function() {
       expect(service.isAuthenticated()).to.be.false;
     });
   });
 
-  describe("isAuthenticated", function() {
+  describe('isAuthenticated - invalid v2 tcsso token', function() {
     beforeEach(function() {
       bard.mockService(AuthTokenService, {
         getV2Token: function() {
-          return "v2Token";
+          return 'v2Token';
         },
         getV3Token: function() {
-          return "V3Token";
+          return 'v3Token';
         },
+        getTCSSOToken: function() {
+          return;
+        }
       });
     });
-    it('should return true for valid tokens', function() {
-      expect(service.isAuthenticated()).to.be.true;
+
+    it('should return false', function() {
+      expect(service.isAuthenticated()).to.be.false;
     });
   });
-  describe("isAuthenticated", function() {
+
+  describe('isAuthenticated - valid tokens', function() {
     beforeEach(function() {
       bard.mockService(AuthTokenService, {
         getV2Token: function() {
-          return ;
+          return 'v2Token';
         },
         getV3Token: function() {
-          return ;
+          return 'V3Token';
         },
+        getTCSSOToken: function() {
+          return 'tcssoToken';
+        }
       });
     });
-    it('should return false for invalid tokens', function() {
-      expect(service.isAuthenticated()).to.be.false;
+
+    it('should return true', function() {
+      expect(service.isAuthenticated()).to.be.true;
     });
   });
 });
-// describe.only('TCAuthService', function() {
-//   beforeEach(function() {
-//       var service;
-//     bard.appModule('tc.services');
-//     bard.inject(this, '$httpBackend', 'AuthTokenService', 'TcAuthService');
-//     bard.mockService(AuthTokenService, {
-//       getV2Token(): function() {return;},
-//       getV3Token(): function() {return "v3token";}
-//     });
-//     service = TcAuthService;
-//     $rootScope.$apply();
-//   });
-
-//   // bard.verifyNoOutstandingHttpRequests();
-
-//   it('should exist', function() {
-//     expect(service).to.exist;
-//   });
-
-// describe('isAuthenticated', function() {
-//   it('should return false for invalid v3 token', function() {
-//     expect(service.isAuthenticated()).to.be.false;
-//   });
-// });
-// });

app/specs.html

@@ -74,6 +74,8 @@ <h1><a href="specs.html">Spec Runner</a></h1>
     <script src="../bower_components/restangular/dist/restangular.js"></script>
     <script src="../bower_components/angular-touch/angular-touch.js"></script>
     <script src="../bower_components/angular-carousel/dist/angular-carousel.js"></script>
+    <script src="../bower_components/matchmedia/matchMedia.js"></script>
+    <script src="../bower_components/ngSticky/lib/sticky.js"></script>
     <script src="../bower_components/angular-mocks/angular-mocks.js"></script>
     <script src="../bower_components/sinon/index.js"></script>
     <script src="../bower_components/bardjs/dist/bard.js"></script>
@@ -95,6 +97,8 @@ <h1><a href="specs.html">Spec Runner</a></h1>
     <script src="/app/skill-picker/skill-picker.module.js"></script>
     <script src="/app/skill-picker/skill-picker.routes.js"></script>
     <script src="/app/skill-picker/skill-picker.controller.js"></script>
+    <script src="/app/sitemap/sitemap.module.js"></script>
+    <script src="/app/sitemap/sitemap.routes.js"></script>
     <script src="/app/settings/settings.module.js"></script>
     <script src="/app/settings/settings.routes.js"></script>
     <script src="/app/settings/settings.controller.js"></script>
@@ -106,17 +110,21 @@ <h1><a href="specs.html">Spec Runner</a></h1>
     <script src="/app/services/user.service.js"></script>
     <script src="/app/services/tcAuth.service.js"></script>
     <script src="/app/services/tags.service.js"></script>
+    <script src="/app/services/statistics.service.js"></script>
     <script src="/app/services/srm.service.js"></script>
     <script src="/app/services/scorecard.service.js"></script>
     <script src="/app/services/review.service.js"></script>
     <script src="/app/services/profile.service.js"></script>
     <script src="/app/services/notification.service.js"></script>
+    <script src="/app/services/nav.service.js"></script>
     <script src="/app/services/memberCert.service.js"></script>
     <script src="/app/services/jwtInterceptor.service.js"></script>
     <script src="/app/services/introduction.service.js"></script>
     <script src="/app/services/image.service.js"></script>
     <script src="/app/services/helpers.service.js"></script>
     <script src="/app/services/externalAccounts.service.js"></script>
+    <script src="/app/services/emptyState.service.js"></script>
+    <script src="/app/services/communityData.service.js"></script>
     <script src="/app/services/challenge.service.js"></script>
     <script src="/app/services/blog.service.js"></script>
     <script src="/app/services/authtoken.service.js"></script>
@@ -155,6 +163,7 @@ <h1><a href="specs.html">Spec Runner</a></h1>
     <script src="/app/layout/layout.module.js"></script>
     <script src="/app/layout/header/header.controller.js"></script>
     <script src="/app/filters/underscore-strip.filter.js"></script>
+    <script src="/app/filters/truncate.filter.js"></script>
     <script src="/app/filters/track.filter.js"></script>
     <script src="/app/filters/time-diff.filter.js"></script>
     <script src="/app/filters/role.filter.js"></script>
@@ -173,6 +182,8 @@ <h1><a href="specs.html">Spec Runner</a></h1>
     <script src="/app/directives/tcui-components.module.js"></script>
     <script src="/app/directives/track-toggle/track-toggle.directive.js"></script>
     <script src="/app/directives/tc-transclude.directive.js"></script>
+    <script src="/app/directives/tc-tabs/tc-tabs.directive.js"></script>
+    <script src="/app/directives/tc-sticky/tc-sticky.directive.js"></script>
     <script src="/app/directives/tc-section/tc-section.directive.js"></script>
     <script src="/app/directives/tc-paginator/tc-paginator.directive.js"></script>
     <script src="/app/directives/tc-endless-paginator/tc-endless-paginator.directive.js"></script>
@@ -181,22 +192,29 @@ <h1><a href="specs.html">Spec Runner</a></h1>
     <script src="/app/directives/skill-tile/skill-tile.directive.js"></script>
     <script src="/app/directives/responsive-carousel/responsive-carousel.directive.js"></script>
     <script src="/app/directives/profile-widget/profile-widget.directive.js"></script>
+    <script src="/app/directives/page-state-header/page-state-header.directive.js"></script>
     <script src="/app/directives/on-file-change.directive.js"></script>
     <script src="/app/directives/ios-card/ios-card.directive.js"></script>
     <script src="/app/directives/input-sticky-placeholder/input-sticky-placeholder.directive.js"></script>
     <script src="/app/directives/history-graph/history-graph.directive.js"></script>
     <script src="/app/directives/header/header-menu-item.directive.js"></script>
     <script src="/app/directives/focus-on.directive.js"></script>
     <script src="/app/directives/external-account/external-account.directive.js"></script>
+    <script src="/app/directives/empty-state-placeholder/empty-state-placeholder.directive.js"></script>
     <script src="/app/directives/distribution-graph/distribution-graph.directive.js"></script>
     <script src="/app/directives/challenge-user-place/challenge-user-place.directive.js"></script>
     <script src="/app/directives/challenge-tile/challenge-tile.directive.js"></script>
+    <script src="/app/directives/challenge-links/challenge-links.directive.js"></script>
     <script src="/app/directives/busy-button/busy-button.directive.js"></script>
     <script src="/app/directives/badges/badge-tooltip.directive.js"></script>
     <script src="/app/directives/account/validate-register.directive.js"></script>
     <script src="/app/directives/account/validate-email.directive.js"></script>
     <script src="/app/directives/account/toggle-password-with-tips/toggle-password-with-tips.directive.js"></script>
     <script src="/app/directives/account/toggle-password/toggle-password.directive.js"></script>
+    <script src="/app/community/community.module.js"></script>
+    <script src="/app/community/statistics.controller.js"></script>
+    <script src="/app/community/members.controller.js"></script>
+    <script src="/app/community/community.routes.js"></script>
     <script src="/app/blocks/logger/logger.module.js"></script>
     <script src="/app/blocks/logger/logger.js"></script>
     <script src="/app/blocks/logger/logEnhancer.js"></script>
@@ -232,15 +250,17 @@ <h1><a href="specs.html">Spec Runner</a></h1>
     <script src="/app/settings/settings.spec.js"></script>
     <script src="/app/skill-picker/skill-picker.spec.js"></script>
     <script src="/app/account/login/login.spec.js"></script>
-    <script src="/app/account/register/register.spec.js"></script>
     <script src="/app/account/reset-password/reset-password.spec.js"></script>
+    <script src="/app/account/register/register.spec.js"></script>
     <script src="/app/blocks/exception/exception-handler.provider.spec.js"></script>
     <script src="/app/directives/badges/badge-tooltip.spec.js"></script>
     <script src="/app/directives/busy-button/busy-button.directive.spec.js"></script>
     <script src="/app/directives/challenge-tile/challenge-tile.spec.js"></script>
     <script src="/app/directives/external-account/external-account.directive.spec.js"></script>
+    <script src="/app/directives/empty-state-placeholder/empty-state-placeholder.spec.js"></script>
     <script src="/app/directives/tc-endless-paginator/tc-endless-paginator.spec.js"></script>
     <script src="/app/directives/tc-paginator/tc-paginator.spec.js"></script>
+    <script src="/app/directives/tc-tabs/tc-tabs.directive.spec.js"></script>
     <script src="/app/my-dashboard/community-updates/community-updates.spec.js"></script>
     <script src="/app/my-dashboard/header-dashboard/header-dashboard.spec.js"></script>
     <script src="/app/my-dashboard/my-challenges/my-challenges.spec.js"></script>