From 81a7300b140667428ab533bf063a1e40165e02db Mon Sep 17 00:00:00 2001
From: Maxi Redigonda <maxiredigonda@gmail.com>
Date: Mon, 14 Oct 2019 11:17:16 -0300
Subject: [PATCH] Fixes tests to meet requirements on color format, and add new
 test to rule out for invalid formats

---
 tests/ticket/create-tag.rb | 44 ++++++++++++++++++++++++++++++++------
 tests/ticket/edit-tag.rb   |  9 ++++----
 tests/ticket/get-tags.rb   |  8 +++----
 3 files changed, 47 insertions(+), 14 deletions(-)

diff --git a/tests/ticket/create-tag.rb b/tests/ticket/create-tag.rb
index 78deba23..49880e41 100644
--- a/tests/ticket/create-tag.rb
+++ b/tests/ticket/create-tag.rb
@@ -7,13 +7,13 @@ describe '/ticket/create-tag' do
             csrf_userid: $csrf_userid,
             csrf_token: $csrf_token,
             name: 'tag1',
-            color: 'blue'
+            color: '#0000ff'
         })
         tag = $database.getRow('tag', 1 , 'id')
 
         (result['status']).should.equal('success')
         (tag['name']).should.equal('tag1')
-        (tag['color']).should.equal('blue')
+        (tag['color']).should.equal('#0000ff')
     end
 
     it 'should not add tag if already exits' do
@@ -21,7 +21,7 @@ describe '/ticket/create-tag' do
             csrf_userid: $csrf_userid,
             csrf_token: $csrf_token,
             name: 'tag1',
-            color: 'blue'
+            color: '#ffffff'
         })
 
         (result['status']).should.equal('fail')
@@ -32,7 +32,7 @@ describe '/ticket/create-tag' do
         result = request('/ticket/create-tag', {
             csrf_userid: $csrf_userid,
             csrf_token: $csrf_token,
-            color: 'black'
+            color: '#ffff00'
         })
 
         (result['status']).should.equal('fail')
@@ -42,7 +42,7 @@ describe '/ticket/create-tag' do
             csrf_userid: $csrf_userid,
             csrf_token: $csrf_token,
             name: 'T',
-            color: 'black'
+            color: '#0000ff'
         })
 
         (result['status']).should.equal('fail')
@@ -55,10 +55,42 @@ describe '/ticket/create-tag' do
             csrf_userid: $csrf_userid,
             csrf_token: $csrf_token,
             name: long_text,
-            color: 'black'
+            color: '#ffff00'
         })
 
         (result['status']).should.equal('fail')
         (result['message']).should.equal('INVALID_NAME')
     end
+
+    it 'should fail if color is invalid' do
+        result = request('/ticket/create-tag', {
+            csrf_userid: $csrf_userid,
+            csrf_token: $csrf_token,
+            name: 'valid name 1',
+            color: '00ff00'
+        })
+
+        (result['status']).should.equal('fail')
+        (result['message']).should.equal('INVALID_COLOR')
+
+        result = request('/ticket/create-tag', {
+            csrf_userid: $csrf_userid,
+            csrf_token: $csrf_token,
+            name: 'valid name 2',
+            color: 'blue'
+        })
+
+        (result['status']).should.equal('fail')
+        (result['message']).should.equal('INVALID_COLOR')
+
+        result = request('/ticket/create-tag', {
+            csrf_userid: $csrf_userid,
+            csrf_token: $csrf_token,
+            name: 'valid name 3',
+            color: '#00ff00ee'
+        })
+
+        (result['status']).should.equal('fail')
+        (result['message']).should.equal('INVALID_COLOR')
+    end
 end
diff --git a/tests/ticket/edit-tag.rb b/tests/ticket/edit-tag.rb
index ce915af0..34ca9153 100644
--- a/tests/ticket/edit-tag.rb
+++ b/tests/ticket/edit-tag.rb
@@ -8,14 +8,14 @@ describe '/ticket/edit-tag' do
             csrf_token: $csrf_token,
             tagId: 1,
             name: 'TAG1',
-            color: 'yellow'
+            color: '#ff00ff'
         })
         (result['status']).should.equal('success')
 
         tag = $database.getRow('tag', 1, 'id')
 
         (tag['name']).should.equal('TAG1')
-        (tag['color']).should.equal('yellow')
+        (tag['color']).should.equal('#ff00ff')
     end
 
     it 'should fail if the name already exists' do
@@ -23,14 +23,15 @@ describe '/ticket/edit-tag' do
             csrf_userid: $csrf_userid,
             csrf_token: $csrf_token,
             name: 'TAG2',
-            color: 'blue'
+            color: '#0000ff'
         })
 
         result = request('/ticket/edit-tag', {
             csrf_userid: $csrf_userid,
             csrf_token: $csrf_token,
             tagId: 2,
-            name: 'TAG1'
+            name: 'TAG1',
+            color: '#ff00ff'
         })
 
         (result['status']).should.equal('fail')
diff --git a/tests/ticket/get-tags.rb b/tests/ticket/get-tags.rb
index 01dbca1c..724eb5e3 100644
--- a/tests/ticket/get-tags.rb
+++ b/tests/ticket/get-tags.rb
@@ -20,7 +20,7 @@ describe '/ticket/get-tags' do
             csrf_userid: $csrf_userid,
             csrf_token: $csrf_token,
             name: 'TAG3',
-            color: 'grey'
+            color: '#dddddd'
         })
         result = request('/ticket/get-tags', {
             csrf_userid: $csrf_userid,
@@ -29,10 +29,10 @@ describe '/ticket/get-tags' do
 
         (result['status']).should.equal('success')
         (result['data'][0]['name']).should.equal('TAG1')
-        (result['data'][0]['color']).should.equal('yellow')
+        (result['data'][0]['color']).should.equal('#ff00ff')
         (result['data'][1]['name']).should.equal('TAG2')
-        (result['data'][1]['color']).should.equal('blue')
+        (result['data'][1]['color']).should.equal('#0000ff')
         (result['data'][2]['name']).should.equal('TAG3')
-        (result['data'][2]['color']).should.equal('grey')
+        (result['data'][2]['color']).should.equal('#dddddd')
     end
 end