Merge 5c25922 into 56a7489

andela · Jul 24, 2018 · 4cb7021 · 4cb7021
2 parents 56a7489 + 5c25922
commit 4cb7021
Show file tree

Hide file tree

Showing 7 changed files with 930 additions and 168 deletions.
diff --git a/app/views/includes/foot.jade b/app/views/includes/foot.jade
@@ -20,6 +20,9 @@ script(type='text/javascript', src='https://code.angularjs.org/1.1.5/angular-coo
 // MomentJS
 script(type='text/javascript', src='https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.22.2/moment.min.js')
 
+//EmojiOne
+script(type='text/javascript', src='https://cdnjs.cloudflare.com/ajax/libs/emojionearea/3.4.1/emojionearea.min.js')
+
 // Cloudinary
 script(type='text/javascript', src='/lib/cloudinary_ng/js/angular.cloudinary.js')
 script(type='text/javascript', src="/lib/ng-file-upload/ng-file-upload.js")

diff --git a/app/views/includes/head.jade b/app/views/includes/head.jade
@@ -15,6 +15,7 @@ head
   link(href='https://fonts.googleapis.com/css?family=Lobster', rel='stylesheet', type='text/css')
   link(rel="stylesheet" href="https://use.fontawesome.com/releases/v5.1.0/css/all.css" integrity="sha384-lKuwvrZot6UHsBSfcMvOkWwlCMgc0TaWr+30HWe3a4ltaBwTZhyTEggF5tJv8tbt" crossorigin="anonymous")
   link(href='https://cdnjs.cloudflare.com/ajax/libs/intro.js/2.9.3/introjs.min.css', rel='stylesheet', type='text/css')
+  link(href='https://cdnjs.cloudflare.com/ajax/libs/emojionearea/3.4.1/emojionearea.min.css', rel='stylesheet', type='text/css')
   link(href="https://fonts.googleapis.com/icon?family=Material+Icons", rel="stylesheet")
 
   meta(property='fb:app_id', content='APP_ID')

diff --git a/frontend-test/angular/game-controller.test.js b/frontend-test/angular/game-controller.test.js
@@ -1,3 +1,4 @@
+
 /* eslint prefer-arrow-callback: 0, func-names: 0, no-undef: 0 */
 describe('Controller: Game(Chat)', function () {
   let $scope;
@@ -36,8 +37,8 @@ describe('Controller: Game(Chat)', function () {
   }));
 
   it('should change the scope MessageInput on submit', function () {
-    $scope.MessageInput = 'This is a test thing';
     spyOn(game, 'dispatchMessage');
+    $scope.MessageInput = 'Hello world';
     $scope.SendMessage();
     expect($scope.MessageInput).toEqual('');
     expect(game.dispatchMessage).toHaveBeenCalled();