Smaller refactoring of send button code.

- Issue #189

2 files changed, 15 insertions, 15 deletions

diff --git a/web-ui/test/spec/mail_view/ui/recipients/recipients_input.spec.js b/web-ui/test/spec/mail_view/ui/recipients/recipients_input.spec.js
index 70ae9301..24d57953 100644
--- a/web-ui/test/spec/mail_view/ui/recipients/recipients_input.spec.js
+++ b/web-ui/test/spec/mail_view/ui/recipients/recipients_input.spec.js
@@ -105,22 +105,22 @@ describeComponent('mail_view/ui/recipients/recipients_input',function () {
   });
 
   describe('on keyup', function () {
-    it('triggers inputHasNoMail if input is empty', function () {
-      var inputHasNoMailEvent = spyOnEvent(document, Pixelated.events.ui.recipients.inputHasNoMail);
+    it('triggers inputFieldIsEmpty if input is empty', function () {
+      var inputFieldIsEmptyEvent = spyOnEvent(document, Pixelated.events.ui.recipients.inputFieldIsEmpty);
       this.$node.val('');
 
       this.$node.trigger('keyup');
 
-      expect(inputHasNoMailEvent).toHaveBeenTriggeredOn(document);
+      expect(inputFieldIsEmptyEvent).toHaveBeenTriggeredOn(document);
     });
 
-    it('triggers inputHasMail if input is not empty', function () {
-      var inputHasMailEvent = spyOnEvent(document, Pixelated.events.ui.recipients.inputHasMail);
+    it('triggers inputFieldHasCharacters if input is not empty', function () {
+      var inputFieldHasCharactersEvent = spyOnEvent(document, Pixelated.events.ui.recipients.inputFieldHasCharacters);
       this.$node.val('lalala');
 
       this.$node.trigger('keyup');
 
-      expect(inputHasMailEvent).toHaveBeenTriggeredOn(document, { name: 'to' });
+      expect(inputFieldHasCharactersEvent).toHaveBeenTriggeredOn(document, { name: 'to' });
     });
   });
 
diff --git a/web-ui/test/spec/mail_view/ui/send_button.spec.js b/web-ui/test/spec/mail_view/ui/send_button.spec.js
index dca8f02c..ff1eecde 100644
--- a/web-ui/test/spec/mail_view/ui/send_button.spec.js
+++ b/web-ui/test/spec/mail_view/ui/send_button.spec.js
@@ -14,8 +14,8 @@ describeComponent('mail_view/ui/send_button', function () {
         this.$node.prop('disabled', true);
       });
 
-      it('gets enabled in a inputHasMail event', function () {
-        $(document).trigger(Pixelated.events.ui.recipients.inputHasMail, { name: 'to' });
+      it('gets enabled in a inputFieldHasCharacters event', function () {
+        $(document).trigger(Pixelated.events.ui.recipients.inputFieldHasCharacters, { name: 'to' });
 
         expect(this.$node).not.toBeDisabled();
       });
@@ -28,20 +28,20 @@ describeComponent('mail_view/ui/send_button', function () {
     });
 
     describe('multiple events', function () {
-      it('gets enabled and remains enabled when a inputHasMail is followed by a recipients:updated with NO new recipients', function () {
+      it('gets enabled and remains enabled when a inputFieldHasCharacters is followed by a recipients:updated with NO new recipients', function () {
         this.$node.prop('disabled', true);
 
-        $(document).trigger(Pixelated.events.ui.recipients.inputHasMail, { name: 'to' });
+        $(document).trigger(Pixelated.events.ui.recipients.inputFieldHasCharacters, { name: 'to' });
         $(document).trigger(Pixelated.events.ui.recipients.updated, { newRecipients: [] });
 
         expect(this.$node).not.toBeDisabled();
       });
 
-      it('gets enabled and remains enabled when a recipients:updated with recipients is followed by a inputHasNoMail', function () {
+      it('gets enabled and remains enabled when a recipients:updated with recipients is followed by a inputFieldIsEmpty', function () {
         this.$node.prop('disabled', true);
 
         $(document).trigger(Pixelated.events.ui.recipients.updated, { newRecipients: ['a@b.c']});
-        $(document).trigger(Pixelated.events.ui.recipients.inputHasNoMail, { name: 'to' });
+        $(document).trigger(Pixelated.events.ui.recipients.inputFieldIsEmpty, { name: 'to' });
 
         expect(this.$node).not.toBeDisabled();
       });
@@ -52,8 +52,8 @@ describeComponent('mail_view/ui/send_button', function () {
         this.$node.prop('disabled', false);
       });
 
-      it('gets disabled in a inputHasNoMail', function () {
-        $(document).trigger(Pixelated.events.ui.recipients.inputHasNoMail, { name: 'to' });
+      it('gets disabled in a inputFieldIsEmpty', function () {
+        $(document).trigger(Pixelated.events.ui.recipients.inputFieldIsEmpty, { name: 'to' });
 
         expect(this.$node).toBeDisabled();
       });
@@ -65,7 +65,7 @@ describeComponent('mail_view/ui/send_button', function () {
       });
 
       it('gets disabled if recipients:updated with invalid email', function () {
-        $(document).trigger(Pixelated.events.ui.recipients.inputHasMail, { name: 'to' });
+        $(document).trigger(Pixelated.events.ui.recipients.inputFieldHasCharacters, { name: 'to' });
         $(document).trigger(Pixelated.events.ui.recipients.updated, { newRecipients: ['InvalidEmail']});
 
         expect(this.$node).not.toBeDisabled();