1 files changed, 9 insertions, 26 deletions
diff --git a/web-ui/test/spec/tags/ui/tag_list.spec.js b/web-ui/test/spec/tags/ui/tag_list.spec.js
index 72667b40..78bd84d9 100644
--- a/web-ui/test/spec/tags/ui/tag_list.spec.js
+++ b/web-ui/test/spec/tags/ui/tag_list.spec.js
@@ -27,7 +27,7 @@ describeComponent('tags/ui/tag_list', function () {
       this.component.attr.default = false;
       var tagList = [tag('tag1', 1), tag('tag2', 2), tag('tag3', 3)];
 
-      $(document).trigger(Pixelated.events.ui.tagList.load, {tags: tagList});
+      $(document).trigger(Pixelated.events.tags.received, {tags: tagList});
 
       var items = _.map(this.$node.find('li'), function (el) {
         return $(el).attr('id');
@@ -39,7 +39,7 @@ describeComponent('tags/ui/tag_list', function () {
     it('should render the default tags when tagsList:load is received and default attribute is true', function () {
       var tagList = [tag('tag1', 1, false), tag('tag2', 2, true), tag('tag3', 3, true)];
 
-      $(document).trigger(Pixelated.events.ui.tagList.load, {tags: tagList});
+      $(document).trigger(Pixelated.events.tags.received, {tags: tagList});
 
       var items = _.map(this.component.select('defaultTagList').find('li'), function (el) {
         return $(el).attr('id');
@@ -51,7 +51,7 @@ describeComponent('tags/ui/tag_list', function () {
     it('should render the custom tags when tagsList:load is received and default attribute is false', function () {
       var tagList = [tag('tag1', 1, false), tag('tag2', 2, true), tag('tag3', 3, true)];
 
-      $(document).trigger(Pixelated.events.ui.tagList.load, {tags: tagList});
+      $(document).trigger(Pixelated.events.tags.received, {tags: tagList});
 
       var items = _.map(this.component.select('customTagList').find('li'), function (el) {
         return $(el).attr('id');
@@ -60,35 +60,18 @@ describeComponent('tags/ui/tag_list', function () {
       expect(items).toEqual(['tag-1']);
     });
 
-    it('should trigger event to tell that tags were loaded sending the current tag', function () {
-      this.component.attr.currentTag = 'Drafts';
-      var tagsLoadedEvent = spyOnEvent(document, Pixelated.events.ui.tags.loaded);
-
-      $(document).trigger(Pixelated.events.ui.tagList.load, {tags: [] });
-
-      expect(tagsLoadedEvent).toHaveBeenTriggeredOnAndWith(document, { tag: 'Drafts'});
-    });
-
-    it('should send tag as undefined when tags are loaded and no tag was selected yet', function () {
-      var tagsLoadedEvent = spyOnEvent(document, Pixelated.events.ui.tags.loaded);
-
-      $(document).trigger(Pixelated.events.ui.tagList.load, {tags: [] });
-
-      expect(tagsLoadedEvent).toHaveBeenTriggeredOnAndWith(document, jasmine.objectContaining({ tag: undefined }));
-    });
-
     it('should save the current tag when a tag is selected', function () {
-      $(document).trigger(Pixelated.events.ui.tag.selected, { tag: 'amazing'});
+      $(document).trigger(Pixelated.events.ui.tag.select, { tag: 'amazing'});
 
       expect(this.component.attr.currentTag).toEqual('amazing');
     });
 
     it('resets the tag lists when loading tags', function () {
       var tagList = [tag('tag1', 1, false), tag('tag2', 2, true), tag('tag3', 3, true)];
-      $(document).trigger(Pixelated.events.ui.tagList.load, {tags: tagList});
+      $(document).trigger(Pixelated.events.tags.received, {tags: tagList});
 
       tagList = [tag('tag1', 1, false), tag('tag2', 2, true)];
-      $(document).trigger(Pixelated.events.ui.tagList.load, {tags: tagList});
+      $(document).trigger(Pixelated.events.tags.received, {tags: tagList});
 
       var customTags = _.map(this.component.select('customTagList').find('li'), function (el) {
         return $(el).attr('id');
@@ -103,10 +86,10 @@ describeComponent('tags/ui/tag_list', function () {
 
     it('resets the tag shortcuts when loading tags', function () {
       var tagList = [tag('inbox', 1, true)];
-      $(document).trigger(Pixelated.events.ui.tagList.load, {tags: tagList});
+      $(document).trigger(Pixelated.events.tags.received, {tags: tagList});
 
       tagList = [tag('sent', 1, true)];
-      $(document).trigger(Pixelated.events.ui.tagList.load, {tags: tagList});
+      $(document).trigger(Pixelated.events.tags.received, {tags: tagList});
 
       var shortcuts = _.map($('#tags-shortcuts').find('li'), function (el) {
         return $(el).text().trim();
@@ -120,7 +103,7 @@ describeComponent('tags/ui/tag_list', function () {
       var tagsTeardownDefault = spyOnEvent(this.component.select('defaultTagList'), Pixelated.events.tags.teardown);
       var tagsShortcutsTeardown = spyOnEvent(document, Pixelated.events.tags.shortcuts.teardown);
 
-      $(document).trigger(Pixelated.events.ui.tagList.load, {tags: []});
+      $(document).trigger(Pixelated.events.tags.received, {tags: []});
 
       expect(tagsTeardownCustom).toHaveBeenTriggeredOn(this.component.select('customTagList'));
       expect(tagsTeardownDefault).toHaveBeenTriggeredOn(this.component.select('defaultTagList'));