From 986d51f53e4e988bbc0a4b347f40404909e0f71a Mon Sep 17 00:00:00 2001
From: David Asabina <david@supr.nu>
Date: Mon, 19 May 2014 00:39:25 +0200
Subject: [PATCH] Ensuring text is empty when icons are set (by default or
 explicitly) + using toHaveText matcher instead of toContainSet

---
 tests/automated/buttonText.js | 187 +++++++++++++++++++++-------------
 1 file changed, 117 insertions(+), 70 deletions(-)

diff --git a/tests/automated/buttonText.js b/tests/automated/buttonText.js
index 53e35a4..8816c63 100644
--- a/tests/automated/buttonText.js
+++ b/tests/automated/buttonText.js
@@ -10,90 +10,137 @@ describe('button text', function() {
         left: 'prevYear,prev,today,next,nextYear',
         center: '',
         right: 'month,basicWeek,basicDay,agendaWeek,agendaDay'
-      },
-      buttonIcons: {
-        prev: null,
-        next: null,
-        prevYear: null,
-        nextYear: null
       }
     };
   });
 
-  describe('when lang is default', function() {
-    beforeEach(function() {
-      $('#cal').fullCalendar(settings);
+  describe('with buttonIcons', function() {
+    describe('when lang is default', function() {
+      it('should have no text', function() {
+        expect($('.fc-button-next')).toHaveText('');
+        expect($('.fc-button-nextYear')).toHaveText('');
+        expect($('.fc-button-prev')).toHaveText('');
+        expect($('.fc-button-prevYear')).toHaveText('');
+      });
     });
 
-    it('should contain the default text values', function() {
-      expect($('.fc-button-today')).toContainText('today');
+    describe('when lang is not default', function() {
+      it('should have no text', function() {
+        settings.lang = 'nl';
+        $('#cal').fullCalendar(settings);
 
-      expect($('.fc-button-next')).toContainText('next');
-      expect($('.fc-button-nextYear')).toContainText('next year');
-      expect($('.fc-button-prev')).toContainText('prev');
-      expect($('.fc-button-prevYear')).toContainText('prev year');
+        expect($('.fc-button-next')).toHaveText('');
+        expect($('.fc-button-nextYear')).toHaveText('');
+        expect($('.fc-button-prev')).toHaveText('');
+        expect($('.fc-button-prevYear')).toHaveText('');
+      });
+    });
 
-      expect($('.fc-button-month')).toContainText('month');
+    describe('when buttonText is set to custom value', function() {
+      it('should have no text', function() {
+        settings.buttonText = {
+          prev: '<-',
+          next: '->',
+          prevYear: '<--',
+          nextYear: '-->',
+          today: 'tidei',
+          month: 'mun',
+          week: 'wiki',
+          day: 'dei'
+        };
+        $('#cal').fullCalendar(settings);
 
-      expect($('.fc-button-basicWeek')).toContainText('week');
-      expect($('.fc-button-agendaWeek')).toContainText('week');
-
-      expect($('.fc-button-basicDay')).toContainText('day');
-      expect($('.fc-button-agendaDay')).toContainText('day');
+        expect($('.fc-button-next')).toHaveText('');
+        expect($('.fc-button-nextYear')).toHaveText('');
+        expect($('.fc-button-prev')).toHaveText('');
+        expect($('.fc-button-prevYear')).toHaveText('');
+      });
     });
   });
-
-  describe('when buttonText is specified', function() {
+  describe('without buttonIcons', function() {
     beforeEach(function() {
-      settings.buttonText = {
-        prev: '<-',
-        next: '->',
-        prevYear: '<--',
-        nextYear: '-->',
-        today: 'tidei',
-        month: 'mun',
-        week: 'wiki',
-        day: 'dei'
-      }
-      $('#cal').fullCalendar(settings);
+      settings.buttonIcons = {
+        prev: null,
+        next: null,
+        prevYear: null,
+        nextYear: null
+      };
     });
-    
-    it('should contain the specified text values', function() {
-      expect($('.fc-button-today')).toContainText('tidei');
 
-      expect($('.fc-button-next')).toContainText('->');
-      expect($('.fc-button-nextYear')).toContainText('-->');
-      expect($('.fc-button-prev')).toContainText('<-');
-      expect($('.fc-button-prevYear')).toContainText('<--');
-
-      expect($('.fc-button-month')).toContainText('mun');
-
-      expect($('.fc-button-agendaDay')).toContainText('dei');
-      expect($('.fc-button-agendaWeek')).toContainText('wiki');
-
-      expect($('.fc-button-basicDay')).toContainText('dei');
-      expect($('.fc-button-basicWeek')).toContainText('wiki');
+    describe('when lang is default', function() {
+      beforeEach(function() {
+        $('#cal').fullCalendar(settings);
+      });
+  
+      it('should contain the default text values', function() {
+        expect($('.fc-button-today')).toHaveText('today');
+  
+        expect($('.fc-button-next')).toHaveText('next');
+        expect($('.fc-button-nextYear')).toHaveText('next year');
+        expect($('.fc-button-prev')).toHaveText('prev');
+        expect($('.fc-button-prevYear')).toHaveText('prev year');
+  
+        expect($('.fc-button-month')).toHaveText('month');
+  
+        expect($('.fc-button-basicWeek')).toHaveText('week');
+        expect($('.fc-button-agendaWeek')).toHaveText('week');
+  
+        expect($('.fc-button-basicDay')).toHaveText('day');
+        expect($('.fc-button-agendaDay')).toHaveText('day');
+      });
+    });
+  
+    describe('when buttonText is specified', function() {
+      beforeEach(function() {
+        settings.buttonText = {
+          prev: '<-',
+          next: '->',
+          prevYear: '<--',
+          nextYear: '-->',
+          today: 'tidei',
+          month: 'mun',
+          week: 'wiki',
+          day: 'dei'
+        }
+        $('#cal').fullCalendar(settings);
+      });
+      
+      it('should contain the specified text values', function() {
+        expect($('.fc-button-today')).toHaveText('tidei');
+  
+        expect($('.fc-button-next')).toHaveText('->');
+        expect($('.fc-button-nextYear')).toHaveText('-->');
+        expect($('.fc-button-prev')).toHaveText('<-');
+        expect($('.fc-button-prevYear')).toHaveText('<--');
+  
+        expect($('.fc-button-month')).toHaveText('mun');
+  
+        expect($('.fc-button-agendaDay')).toHaveText('dei');
+        expect($('.fc-button-agendaWeek')).toHaveText('wiki');
+  
+        expect($('.fc-button-basicDay')).toHaveText('dei');
+        expect($('.fc-button-basicWeek')).toHaveText('wiki');
+      });
+    });
+  
+    describe('when lang is not default', function() {
+  
+      beforeEach(function() {
+        settings.lang = 'nl';
+        $('#cal').fullCalendar(settings);
+      });
+   
+      it('should contain the default text values', function() {
+        expect($('.fc-button-today')).toHaveText('Vandaag');
+  
+        expect($('.fc-button-month')).toHaveText('Maand');
+  
+        expect($('.fc-button-basicWeek')).toHaveText('Week');
+        expect($('.fc-button-agendaWeek')).toHaveText('Week');
+  
+        expect($('.fc-button-basicDay')).toHaveText('Dag');
+        expect($('.fc-button-agendaDay')).toHaveText('Dag');
+      });
     });
   });
-
-  describe('when lang is not default', function() {
-
-    beforeEach(function() {
-      settings.lang = 'nl';
-      $('#cal').fullCalendar(settings);
-    });
- 
-    it('should contain the default text values', function() {
-      expect($('.fc-button-today')).toContainText('Vandaag');
-
-      expect($('.fc-button-month')).toContainText('Maand');
-
-      expect($('.fc-button-basicWeek')).toContainText('Week');
-      expect($('.fc-button-agendaWeek')).toContainText('Week');
-
-      expect($('.fc-button-basicDay')).toContainText('Dag');
-      expect($('.fc-button-agendaDay')).toContainText('Dag');
-    });
-  });
-
 });