From 03bc92006d87e02d967ca98c19998077d5dbdd3a Mon Sep 17 00:00:00 2001 From: Bart Date: Mon, 3 Apr 2017 16:01:53 +0200 Subject: [PATCH] Added tests for AppImPanelController, DocumentModalController, EmbedModalController and VideoModalController (#1362) * Added test for AppImPanelControllerSpec, cleaned up style of all tests All tests give 0 errors when running gulp standard All credits for those test still go to @Ryuno-Ki, I did not functionaly change the testing code * add Test for DocumentModalController * added tests for the EmbedModalController and VideoModalController --- test/unit/AppImPanelControllerSpec.js | 21 ++++ test/unit/AppLangSelectControllerSpec.js | 50 ++++---- test/unit/AppWelcomeControllerSpec.js | 100 ++++++++-------- test/unit/DocumentModalControllerSpec.js | 132 +++++++++++++++++++++ test/unit/EmbedModalController.js | 91 +++++++++++++++ test/unit/PhonebookContactsServiceSpec.js | 64 ++++++----- test/unit/VideoModalControllerSpec.js | 134 ++++++++++++++++++++++ test/unit/chatTitleFilterSpec.js | 36 +++--- test/unit/myHeadDirective.js | 32 +++--- test/unit/myLangFooterDirective.js | 42 +++---- test/unit/userFirstNameFilterSpec.js | 47 ++++---- test/unit/userNameFilterSpec.js | 46 ++++---- 12 files changed, 594 insertions(+), 201 deletions(-) create mode 100644 test/unit/AppImPanelControllerSpec.js create mode 100644 test/unit/DocumentModalControllerSpec.js create mode 100644 test/unit/EmbedModalController.js create mode 100644 test/unit/VideoModalControllerSpec.js diff --git a/test/unit/AppImPanelControllerSpec.js b/test/unit/AppImPanelControllerSpec.js new file mode 100644 index 00000000..4ed5667f --- /dev/null +++ b/test/unit/AppImPanelControllerSpec.js @@ -0,0 +1,21 @@ +/* global describe, it, inject, expect, beforeEach, jasmine */ + +describe('AppImPanelController', function () { + var $scope + + beforeEach(module('myApp.controllers')) + + beforeEach(function () { + inject(function (_$controller_, _$rootScope_) { + $scope = _$rootScope_.$new() + $scope.$on = jasmine.createSpy('$on') + _$controller_('AppImPanelController', { $scope: $scope }) + }) + }) + + // define tests + it('sets $on(user_update) to no-operation function', function (done) { + expect($scope.$on).toHaveBeenCalledWith('user_update', angular.noop) + done() + }) +}) diff --git a/test/unit/AppLangSelectControllerSpec.js b/test/unit/AppLangSelectControllerSpec.js index 4466efa2..c7d598cf 100644 --- a/test/unit/AppLangSelectControllerSpec.js +++ b/test/unit/AppLangSelectControllerSpec.js @@ -1,13 +1,15 @@ +/* global describe, it, inject, expect, beforeEach, xit */ + describe('AppLangSelectController', function () { - var $controller, $scope; + var $controller, $scope - beforeEach(module('ui.bootstrap')); - beforeEach(module('myApp.services')); - beforeEach(module('myApp.controllers')); + beforeEach(module('ui.bootstrap')) + beforeEach(module('myApp.services')) + beforeEach(module('myApp.controllers')) beforeEach(function () { inject(function (_$controller_, _$rootScope_, _, Storage, ErrorService, AppRuntimeManager) { - $controller = _$controller_; + $controller = _$controller_ $scope = _$rootScope_.$new() $controller('AppLangSelectController', { $scope: $scope, @@ -15,36 +17,36 @@ describe('AppLangSelectController', function () { Storage: Storage, ErrorService: ErrorService, AppRuntimeManager: AppRuntimeManager - }); - }); - }); + }) + }) + }) it('holds the supportedLocales', function () { - expect($scope.supportedLocales).toBeDefined(); - }); + expect($scope.supportedLocales).toBeDefined() + }) it('holds langNames', function () { - expect($scope.langNames).toBeDefined(); - }); + expect($scope.langNames).toBeDefined() + }) it('holds the current locale', function () { - expect($scope.curLocale).toBeDefined(); - }); + expect($scope.curLocale).toBeDefined() + }) it('has a locale form', function () { - expect($scope.form).toBeDefined(); - expect($scope.form.locale).toBeDefined(); - }); + expect($scope.form).toBeDefined() + expect($scope.form.locale).toBeDefined() + }) it('allows to select a locale', function () { - expect($scope.localeSelect).toBeDefined(); - }); + expect($scope.localeSelect).toBeDefined() + }) describe('when the user switches the locale', function () { describe('and confirms the dialogue', function () { xit('reloads the app', function (done) { - done(); - }); - }); - }); -}); + done() + }) + }) + }) +}) diff --git a/test/unit/AppWelcomeControllerSpec.js b/test/unit/AppWelcomeControllerSpec.js index 68a56414..a3c8a856 100644 --- a/test/unit/AppWelcomeControllerSpec.js +++ b/test/unit/AppWelcomeControllerSpec.js @@ -1,50 +1,52 @@ +/* global describe, it, inject, expect, beforeEach */ + describe('AppWelcomeController', function () { - var $controller, $rootScope, $scope, $location, MtApiManager, ErrorService, - ChangelogNotifyService, LayoutSwitchService; - - beforeEach(module('myApp.controllers')); - - beforeEach(function () { - ChangelogNotifyService = { - checkUpdate: function () {} - }; - - LayoutSwitchService = { - start: function () {} - }; - - MtpApiManager = { - getUserID: function () { - return { - then: function () {} - }; - } - }; - - module(function ($provide) { - $provide.value('MtpApiManager', MtpApiManager); - }); - - inject(function (_$controller_, _$rootScope_, _$location_) { - $controller = _$controller_; - $rootScope = _$rootScope_; - $location = _$location_; - - $scope = $rootScope.$new(); - $controller('AppWelcomeController', { - $scope: $scope, - $location: $location, - MtpApiManager: MtpApiManager, - ErrorService: ErrorService, - ChangelogNotifyService: ChangelogNotifyService, - LayoutSwitchService: LayoutSwitchService - }); - }); - }); - - // https://stackoverflow.com/a/36460924 - it('executes a dummy spec', function (done) { - expect(true).toBe(true); - done(); - }); -}); + var $controller, $rootScope, $scope, $location, MtpApiManager, ErrorService, + ChangelogNotifyService, LayoutSwitchService + + beforeEach(module('myApp.controllers')) + + beforeEach(function () { + ChangelogNotifyService = { + checkUpdate: function () {} + } + + LayoutSwitchService = { + start: function () {} + } + + MtpApiManager = { + getUserID: function () { + return { + then: function () {} + } + } + } + + module(function ($provide) { + $provide.value('MtpApiManager', MtpApiManager) + }) + + inject(function (_$controller_, _$rootScope_, _$location_) { + $controller = _$controller_ + $rootScope = _$rootScope_ + $location = _$location_ + + $scope = $rootScope.$new() + $controller('AppWelcomeController', { + $scope: $scope, + $location: $location, + MtpApiManager: MtpApiManager, + ErrorService: ErrorService, + ChangelogNotifyService: ChangelogNotifyService, + LayoutSwitchService: LayoutSwitchService + }) + }) + }) + + // https://stackoverflow.com/a/36460924 + it('executes a dummy spec', function (done) { + expect(true).toBe(true) + done() + }) +}) diff --git a/test/unit/DocumentModalControllerSpec.js b/test/unit/DocumentModalControllerSpec.js new file mode 100644 index 00000000..e3236760 --- /dev/null +++ b/test/unit/DocumentModalControllerSpec.js @@ -0,0 +1,132 @@ +/* global describe, it, inject, expect, beforeEach, jasmine */ + +describe('DocumentModalController', function () { + var $controller, $scope, $rootScope, $docManager, $errService, $input, $messManager, $pSelectService, $modalI, createController + + beforeEach(module('myApp.controllers')) + + beforeEach(function () { + $docManager = {} + $docManager.wrapForHistory = jasmine.createSpy('wrapForHistory') + $docManager.saveDocFile = jasmine.createSpy('saveDocFile') + + $input = {} + $errService = { + confirm: function (message) { + $input = message + return { + then: function (f) { + f() + } + } + } + } + + $pSelectService = { + selectPeer: function (options) { + $input = options + return { + then: function (f) { + f('Peerselected') + } + } + } + } + + createController = function (spyBroadcast, spyOn) { + if (spyBroadcast) { + $rootScope.$broadcast = jasmine.createSpy('$broadcast') + } + if (spyOn) { + $scope.$on = jasmine.createSpy('$on') + } + $controller('DocumentModalController', { + $scope: $scope, + $rootScope: $rootScope, + $modalInstance: $modalI, + PeersSelectService: $pSelectService, + AppMessagesManager: $messManager, + AppDocsManager: $docManager, + AppPeersManager: {}, + ErrorService: $errService + }) + } + + $messManager = {} + $messManager.deleteMessages = jasmine.createSpy('deleteMessages') + + $modalI = {} + $modalI.dismiss = jasmine.createSpy('dismissModal') + + inject(function (_$controller_, _$rootScope_) { + $rootScope = _$rootScope_ + $scope = $rootScope.$new() + $scope.docID = 'randomdoc' + + $controller = _$controller_ + }) + }) + + // define tests + it('sets the document in the scope', function (done) { + createController(false, false) + + expect($docManager.wrapForHistory).toHaveBeenCalledWith($scope.docID) + done() + }) + + it('forwards a message with a document', function (done) { + createController(true, false) + $scope.messageID = 'id039' + + $scope.forward() + expect($input).toEqual({canSend: true}) + expect($scope.$broadcast).toHaveBeenCalledWith('history_focus', { + peerString: 'Peerselected', + attachment: { + _: 'fwd_messages', + id: [$scope.messageID] + } + }) + done() + }) + + it('deletes a message with a document', function (done) { + createController(false, false) + $scope.messageID = 'id123' + + $scope.delete() + expect($input).toEqual({type: 'MESSAGE_DELETE'}) + expect($messManager.deleteMessages).toHaveBeenCalledWith([$scope.messageID]) + done() + }) + + it('downloads the document', function (done) { + createController(false, false) + + $scope.download() + expect($docManager.saveDocFile).toHaveBeenCalledWith($scope.docID) + done() + }) + + it('delete a document linked to a message', function (done) { + createController(false, true) + $scope.messageID = 'id33' + + $rootScope.$broadcast('history_delete') + expect($scope.$on).toHaveBeenCalledWith('history_delete', jasmine.any(Function)) + expect($modalI.dismiss).not.toHaveBeenCalled() + done() + }) + + it('delete a document linked to a modal instance', function (done) { + createController(false, false) + $scope.messageID = 'id876' + + var $msgs = {} + $msgs[$scope.messageID] = {message: 'some non-empty message'} + $rootScope.$broadcast('history_delete', {msgs: $msgs}) + expect($modalI.dismiss).toHaveBeenCalled() + done() + }) +}) diff --git a/test/unit/EmbedModalController.js b/test/unit/EmbedModalController.js new file mode 100644 index 00000000..a7bf1012 --- /dev/null +++ b/test/unit/EmbedModalController.js @@ -0,0 +1,91 @@ +/* global describe, it, inject, expect, beforeEach, jasmine */ + +describe('EmbedModalController', function () { + var $scope, $rootScope, $webpageManager, $errService, $input, $messManager, $pSelectService, $modalI + + beforeEach(module('myApp.controllers')) + + beforeEach(function () { + $webpageManager = {} + $webpageManager.wrapForFull = jasmine.createSpy('wrapForFull') + + $input = {} + $errService = { + confirm: function (message) { + $input = message + return { + then: function (f) { + f() + } + } + } + } + + $pSelectService = { + selectPeer: function (options) { + $input = options + return { + then: function (f) { + f('Peerselected') + } + } + } + } + + $messManager = {} + $messManager.deleteMessages = jasmine.createSpy('deleteMessages') + + $modalI = {} + $modalI.dismiss = jasmine.createSpy('dismissModal') + + inject(function (_$controller_, _$rootScope_) { + $rootScope = _$rootScope_ + $rootScope.$broadcast = jasmine.createSpy('$broadcast') + $scope = $rootScope.$new() + $scope.webpageID = 'www.notRelevant.com' + _$controller_('EmbedModalController', { + $q: {}, + $scope: $scope, + $rootScope: $rootScope, + $modalInstance: $modalI, + PeersSelectService: $pSelectService, + AppMessagesManager: $messManager, + AppPeersManager: {}, + AppPhotosManager: {}, + AppWebPagesManager: $webpageManager, + ErrorService: $errService + }) + }) + }) + + // define tests + it('sets the embeded webpage in the scope', function (done) { + expect($scope.nav).toEqual({}) + expect($webpageManager.wrapForFull).toHaveBeenCalledWith($scope.webpageID) + done() + }) + + it('forwards a message with an embeded link', function (done) { + $scope.messageID = 'id1234234' + + $scope.forward() + expect($input).toEqual({canSend: true}) + expect($scope.$broadcast).toHaveBeenCalledWith('history_focus', { + peerString: 'Peerselected', + attachment: { + _: 'fwd_messages', + id: [$scope.messageID] + } + }) + done() + }) + + it('deletes a message with an embeded link', function (done) { + $scope.messageID = 'id979565673' + + $scope.delete() + expect($input).toEqual({type: 'MESSAGE_DELETE'}) + expect($messManager.deleteMessages).toHaveBeenCalledWith([$scope.messageID]) + done() + }) +}) diff --git a/test/unit/PhonebookContactsServiceSpec.js b/test/unit/PhonebookContactsServiceSpec.js index 48607aa7..a35c690e 100644 --- a/test/unit/PhonebookContactsServiceSpec.js +++ b/test/unit/PhonebookContactsServiceSpec.js @@ -1,56 +1,58 @@ +/* global describe, it, inject, expect, beforeEach, jasmine, xit */ + describe('PhonebookContactsService', function () { - var PhonebookContactsService; + var PhonebookContactsService, $modal - beforeEach(module('ui.bootstrap')); - beforeEach(module('myApp.services')); + beforeEach(module('ui.bootstrap')) + beforeEach(module('myApp.services')) beforeEach(inject(function (_PhonebookContactsService_) { - PhonebookContactsService = _PhonebookContactsService_; - })); + PhonebookContactsService = _PhonebookContactsService_ + })) describe('Public API:', function () { it('checks availability', function () { - expect(PhonebookContactsService.isAvailable).toBeDefined(); - }); + expect(PhonebookContactsService.isAvailable).toBeDefined() + }) it('open the phonebook for import', function () { - expect(PhonebookContactsService.openPhonebookImport).toBeDefined(); - }); + expect(PhonebookContactsService.openPhonebookImport).toBeDefined() + }) it('get phonebook contacts', function () { - expect(PhonebookContactsService.getPhonebookContacts).toBeDefined(); - }); + expect(PhonebookContactsService.getPhonebookContacts).toBeDefined() + }) describe('usage', function () { describe('of isAvailable()', function () { it('returns false in most cases', function (done) { - expect(PhonebookContactsService.isAvailable()).toBe(false); - done(); - }); - }); + expect(PhonebookContactsService.isAvailable()).toBe(false) + done() + }) + }) describe('of openPhonebookImport()', function () { - beforeEach(function() { + beforeEach(function () { $modal = { open: jasmine.createSpy('open') - }; - }); + } + }) xit('opens a modal', function () { - PhonebookContactsService.openPhonebookImport(); - expect($modal.open).toHaveBeenCalled(); - }); - }); + PhonebookContactsService.openPhonebookImport() + expect($modal.open).toHaveBeenCalled() + }) + }) describe('of getPhonebookContacts()', function () { xit('will get rejected in most cases', function (done) { - promise = PhonebookContactsService.getPhonebookContacts(); + var promise = PhonebookContactsService.getPhonebookContacts() promise.finally(function () { - expect(promise.isFullfilled()).toBe(true); - done(); - }); - }); - }); - }); - }); -}); + expect(promise.isFullfilled()).toBe(true) + done() + }) + }) + }) + }) + }) +}) diff --git a/test/unit/VideoModalControllerSpec.js b/test/unit/VideoModalControllerSpec.js new file mode 100644 index 00000000..ecd2345c --- /dev/null +++ b/test/unit/VideoModalControllerSpec.js @@ -0,0 +1,134 @@ +/* global describe, it, inject, expect, beforeEach, jasmine */ + +describe('VideoModalController', function () { + var $controller, $scope, $rootScope, $docManager, $errService, $input, $messManager, $pSelectService, $modalI, createController + + beforeEach(module('myApp.controllers')) + + beforeEach(function () { + $docManager = {} + $docManager.wrapVideoForFull = jasmine.createSpy('wrapVideoForFull') + $docManager.saveDocFile = jasmine.createSpy('saveDocFile') + + $input = {} + $errService = { + confirm: function (message) { + $input = message + return { + then: function (f) { + f() + } + } + } + } + + $pSelectService = { + selectPeer: function (options) { + $input = options + return { + then: function (f) { + f('Peerselected') + } + } + } + } + + createController = function (spyBroadcast, spyOn) { + if (spyBroadcast) { + $rootScope.$broadcast = jasmine.createSpy('$broadcast') + } + if (spyOn) { + $scope.$on = jasmine.createSpy('$on') + } + $controller('VideoModalController', { + $scope: $scope, + $rootScope: $rootScope, + $modalInstance: $modalI, + PeersSelectService: $pSelectService, + AppMessagesManager: $messManager, + AppDocsManager: $docManager, + AppPeersManager: {}, + ErrorService: $errService + }) + } + + $messManager = {} + $messManager.deleteMessages = jasmine.createSpy('deleteMessages') + + $modalI = {} + $modalI.dismiss = jasmine.createSpy('dismissModal') + + inject(function (_$controller_, _$rootScope_) { + $rootScope = _$rootScope_ + $scope = $rootScope.$new() + $scope.docID = 'randomvideo' + + $controller = _$controller_ + }) + }) + + // define tests + it('sets the video in the scope', function (done) { + createController(false, false) + + expect($scope.progress).toEqual({enabled: false}) + expect($scope.player).toEqual({}) + expect($docManager.wrapVideoForFull).toHaveBeenCalledWith($scope.docID) + done() + }) + + it('forwards a message with a video', function (done) { + createController(true, false) + $scope.messageID = 'id68567' + + $scope.forward() + expect($input).toEqual({canSend: true}) + expect($scope.$broadcast).toHaveBeenCalledWith('history_focus', { + peerString: 'Peerselected', + attachment: { + _: 'fwd_messages', + id: [$scope.messageID] + } + }) + done() + }) + + it('deletes a message with a video', function (done) { + createController(false, false) + $scope.messageID = 'id235235' + + $scope.delete() + expect($input).toEqual({type: 'MESSAGE_DELETE'}) + expect($messManager.deleteMessages).toHaveBeenCalledWith([$scope.messageID]) + done() + }) + + it('downloads the document (video)', function (done) { + createController(false, false) + + $scope.download() + expect($docManager.saveDocFile).toHaveBeenCalledWith($scope.docID) + done() + }) + + it('delete a video linked to a message', function (done) { + createController(false, true) + $scope.messageID = 'id2352' + + $rootScope.$broadcast('history_delete') + expect($scope.$on).toHaveBeenCalledWith('history_delete', jasmine.any(Function)) + expect($modalI.dismiss).not.toHaveBeenCalled() + done() + }) + + it('delete a video linked to a modal instance', function (done) { + createController(false, false) + $scope.messageID = 'id6234' + + var $msgs = {} + $msgs[$scope.messageID] = {message: 'some non-empty message'} + $rootScope.$broadcast('history_delete', {msgs: $msgs}) + expect($modalI.dismiss).toHaveBeenCalled() + done() + }) +}) diff --git a/test/unit/chatTitleFilterSpec.js b/test/unit/chatTitleFilterSpec.js index 1ba7a9c9..347cdd5a 100644 --- a/test/unit/chatTitleFilterSpec.js +++ b/test/unit/chatTitleFilterSpec.js @@ -1,31 +1,33 @@ +/* global describe, it, inject, expect, beforeEach */ + describe('chatTitle filter', function () { - var $filter, _, chatTitleFilter; + var $filter, _, chatTitleFilter - beforeEach(module('myApp.filters')); + beforeEach(module('myApp.filters')) beforeEach(inject(function (_$filter_, ___) { - $filter = _$filter_; - _ = ___; - })); + $filter = _$filter_ + _ = ___ + })) beforeEach(function () { - chatTitleFilter = $filter('chatTitle'); - }); + chatTitleFilter = $filter('chatTitle') + }) it('displays chat title deleted', function () { - var expected = _('chat_title_deleted'); - var actual = chatTitleFilter(null); + var expected = _('chat_title_deleted') + var actual = chatTitleFilter(null) - expect(actual).toEqual(expected); - }); + expect(actual).toEqual(expected) + }) it('displays the chat title', function () { var chat = { title: 'Telegraph is hot!' - }; - var expected = chat.title; - var actual = chatTitleFilter(chat); + } + var expected = chat.title + var actual = chatTitleFilter(chat) - expect(actual).toEqual(expected); - }); -}); + expect(actual).toEqual(expected) + }) +}) diff --git a/test/unit/myHeadDirective.js b/test/unit/myHeadDirective.js index a379b0e4..6aab50ec 100644 --- a/test/unit/myHeadDirective.js +++ b/test/unit/myHeadDirective.js @@ -1,23 +1,25 @@ +/* global describe, it, inject, expect, beforeEach */ + describe('myHead directive', function () { - var $compile, $rootScope; + var $compile, $rootScope - beforeEach(module('myApp.templates')); - beforeEach(module('myApp.directives')); + beforeEach(module('myApp.templates')) + beforeEach(module('myApp.directives')) beforeEach(inject(function (_$compile_, _$rootScope_) { - $compile = _$compile_; - $rootScope = _$rootScope_; - })); + $compile = _$compile_ + $rootScope = _$rootScope_ + })) it('compiles a my-head attribute', function () { - var compiledElement = $compile('
')($rootScope); - $rootScope.$digest(); // Fire watchers - expect(compiledElement.html()).toContain('tg_page_head'); - }); + var compiledElement = $compile('
')($rootScope) + $rootScope.$digest() // Fire watchers + expect(compiledElement.html()).toContain('tg_page_head') + }) it('compiles a my-head element', function () { - var compiledElement = $compile('')($rootScope); - $rootScope.$digest(); // Fire watchers - expect(compiledElement.html()).toContain('tg_page_head'); - }); -}); + var compiledElement = $compile('')($rootScope) + $rootScope.$digest() // Fire watchers + expect(compiledElement.html()).toContain('tg_page_head') + }) +}) diff --git a/test/unit/myLangFooterDirective.js b/test/unit/myLangFooterDirective.js index 36cb0051..3bdd65bf 100644 --- a/test/unit/myLangFooterDirective.js +++ b/test/unit/myLangFooterDirective.js @@ -1,30 +1,32 @@ +/* global describe, it, inject, expect, beforeEach */ + describe('myLangFooter directive', function () { - var $compile, $rootScope; + var $compile, $rootScope - beforeEach(module('ui.bootstrap')); - beforeEach(module('myApp.templates')); + beforeEach(module('ui.bootstrap')) + beforeEach(module('myApp.templates')) // ErrorServiceProvider in myApp.services is needed by // AppLangSelectController in myApp.controllers - beforeEach(module('myApp.services')); - beforeEach(module('myApp.controllers')); - beforeEach(module('myApp.directives')); + beforeEach(module('myApp.services')) + beforeEach(module('myApp.controllers')) + beforeEach(module('myApp.directives')) beforeEach(inject(function (_$compile_, _$rootScope_) { - $compile = _$compile_; - $rootScope = _$rootScope_; - })); + $compile = _$compile_ + $rootScope = _$rootScope_ + })) it('compiles a my-lang-footer attribute', function () { - var compiledElement = $compile('
')($rootScope); - $rootScope.$digest(); // Fire watchers - expect(compiledElement.html()).toContain('footer_lang_link'); - expect(compiledElement.html()).toContain('AppLangSelectController'); - }); + var compiledElement = $compile('
')($rootScope) + $rootScope.$digest() // Fire watchers + expect(compiledElement.html()).toContain('footer_lang_link') + expect(compiledElement.html()).toContain('AppLangSelectController') + }) it('compiles a my-lang-footer element', function () { - var compiledElement = $compile('')($rootScope); - $rootScope.$digest(); // Fire watchers - expect(compiledElement.html()).toContain('footer_lang_link'); - expect(compiledElement.html()).toContain('AppLangSelectController'); - }); -}); + var compiledElement = $compile('')($rootScope) + $rootScope.$digest() // Fire watchers + expect(compiledElement.html()).toContain('footer_lang_link') + expect(compiledElement.html()).toContain('AppLangSelectController') + }) +}) diff --git a/test/unit/userFirstNameFilterSpec.js b/test/unit/userFirstNameFilterSpec.js index 8f6dd63a..aacc38c0 100644 --- a/test/unit/userFirstNameFilterSpec.js +++ b/test/unit/userFirstNameFilterSpec.js @@ -1,42 +1,43 @@ +/* global describe, it, inject, expect, beforeEach */ + describe('userFirstName filter', function () { - var $filter, _, userFirstNameFilter; + var $filter, _, userFirstNameFilter - beforeEach(module('myApp.filters')); + beforeEach(module('myApp.filters')) beforeEach(inject(function (_$filter_, ___) { - $filter = _$filter_; - _ = ___; - })); + $filter = _$filter_ + _ = ___ + })) beforeEach(function () { - userFirstNameFilter = $filter('userFirstName'); - }); + userFirstNameFilter = $filter('userFirstName') + }) it('displays user first name deleted', function () { - var expected = _('user_first_name_deleted'); - var actual = userFirstNameFilter(null); + var expected = _('user_first_name_deleted') + var actual = userFirstNameFilter(null) - expect(actual).toEqual(expected); - }); + expect(actual).toEqual(expected) + }) it('displays the first name', function () { var user = { first_name: 'John' - }; - var expected = user.first_name; - var actual = userFirstNameFilter(user); + } + var expected = user.first_name + var actual = userFirstNameFilter(user) - expect(actual).toEqual(expected); - }); + expect(actual).toEqual(expected) + }) it('displays the last name alternatively', function () { var user = { last_name: 'Doe' - }; - var expected = user.last_name; - var actual = userFirstNameFilter(user); - - expect(actual).toEqual(expected); - }); + } + var expected = user.last_name + var actual = userFirstNameFilter(user) -}); + expect(actual).toEqual(expected) + }) +}) diff --git a/test/unit/userNameFilterSpec.js b/test/unit/userNameFilterSpec.js index 78ccfe14..9395ecfa 100644 --- a/test/unit/userNameFilterSpec.js +++ b/test/unit/userNameFilterSpec.js @@ -1,42 +1,44 @@ +/* global describe, it, inject, expect, beforeEach */ + describe('userName filter', function () { - var $filter, _, userNameFilter; + var $filter, _, userNameFilter - beforeEach(module('myApp.filters')); + beforeEach(module('myApp.filters')) beforeEach(inject(function (_$filter_, ___) { - $filter = _$filter_; - _ = ___; - })); + $filter = _$filter_ + _ = ___ + })) beforeEach(function () { - userNameFilter = $filter('userName'); - }); + userNameFilter = $filter('userName') + }) it('displays user name deleted', function () { - var expected = _('user_name_deleted'); - var actual = userNameFilter(null); + var expected = _('user_name_deleted') + var actual = userNameFilter(null) - expect(actual).toEqual(expected); - }); + expect(actual).toEqual(expected) + }) it('displays the first name', function () { var user = { first_name: 'John' - }; - var expected = user.first_name; - var actual = userNameFilter(user); + } + var expected = user.first_name + var actual = userNameFilter(user) - expect(actual).toEqual(expected); - }); + expect(actual).toEqual(expected) + }) it('displays both, the first and the last name', function () { var user = { first_name: 'John', last_name: 'Doe' - }; - var expected = user.first_name + ' ' + user.last_name; - var actual = userNameFilter(user); + } + var expected = user.first_name + ' ' + user.last_name + var actual = userNameFilter(user) - expect(actual).toEqual(expected); - }); -}); + expect(actual).toEqual(expected) + }) +})