#1019 Ticket unit tests

Author: allmightyspiff

SoftLayer/CLI/ticket/list.py

@@ -31,8 +31,8 @@ def cli(env, is_open):
             click.wrap_text(ticket['title']),
             ticket['lastEditDate'],
             ticket['status']['name'],
-            ticket['updateCount'],
-            ticket['priority']
+            ticket.get('updateCount', 0),
+            ticket.get('priority', 0)
         ])
 
     env.fout(table)

SoftLayer/managers/ticket.py

@@ -73,7 +73,7 @@ def create_ticket(self, title=None, body=None, subject=None, priority=None):
             'title': title,
         }
         if priority is not None:
-            new_ticket['priority'] = priority
+            new_ticket['priority'] = int(priority)
 
         created_ticket = self.ticket.createStandardTicket(new_ticket, body)
         return created_ticket
@@ -86,18 +86,12 @@ def update_ticket(self, ticket_id=None, body=None):
         """
         return self.ticket.addUpdate({'entry': body}, id=ticket_id)
 
-    def upload_attachment(self, ticket_id=None, file_path=None,
-                          file_name=None):
+    def upload_attachment(self, ticket_id=None, file_path=None, file_name=None):
         """Upload an attachment to a ticket.
 
-        :param integer ticket_id: the id of the ticket to
-                                  upload the attachment to
-        :param string file_path:
-                                  The path of the attachment to be uploaded
-        :param string file_name:
-                                  The name of the attachment shown
-                                  in the ticket
-
+        :param integer ticket_id: the id of the ticket to upload the attachment to
+        :param string file_path: The path of the attachment to be uploaded
+        :param string file_name: The name of the attachment shown in the ticket
         :returns: dict -- The uploaded attachment
         """
         file_content = None

tests/CLI/modules/ticket_tests.py

@@ -8,6 +8,9 @@
 import mock
 
 from SoftLayer.CLI import exceptions
+from SoftLayer.CLI import formatting
+from SoftLayer.CLI import ticket
+from SoftLayer.managers import TicketManager
 from SoftLayer import testing
 
 
@@ -20,10 +23,12 @@ def test_list(self):
             'assigned_user': 'John Smith',
             'id': 102,
             'last_edited': '2013-08-01T14:16:47-07:00',
+            'priority': 0,
             'status': 'Open',
-            'title': 'Cloud Instance Cancellation - 08/01/13'}]
+            'title': 'Cloud Instance Cancellation - 08/01/13',
+            'updates': 0}]
         self.assert_no_fail(result)
-        self.assertEqual(json.loads(result.output), expected)
+        self.assertEqual(expected, json.loads(result.output))
 
     def test_detail(self):
         result = self.run_command(['ticket', 'detail', '1'])
@@ -32,6 +37,7 @@ def test_detail(self):
             'created': '2013-08-01T14:14:04-07:00',
             'edited': '2013-08-01T14:16:47-07:00',
             'id': 100,
+            'priority': 'No Priority',
             'status': 'Closed',
             'title': 'Cloud Instance Cancellation - 08/01/13',
             'update 1': 'a bot says something',
@@ -53,8 +59,23 @@ def test_create(self):
                  'assignedUserId': 12345,
                  'title': 'Test'}, 'ticket body')
 
-        self.assert_called_with('SoftLayer_Ticket', 'createStandardTicket',
-                                args=args)
+        self.assert_called_with('SoftLayer_Ticket', 'createStandardTicket', args=args)
+
+    def test_create_with_priority(self):
+        result = self.run_command(['ticket', 'create', '--title=Test',
+                                   '--subject-id=1000',
+                                   '--body=ticket body',
+                                   '--priority=1'])
+
+        self.assert_no_fail(result)
+
+        args = ({'subjectId': 1000,
+                 'contents': 'ticket body',
+                 'assignedUserId': 12345,
+                 'title': 'Test',
+                 'priority': 1}, 'ticket body')
+
+        self.assert_called_with('SoftLayer_Ticket', 'createStandardTicket', args=args)
 
     def test_create_and_attach(self):
         result = self.run_command(['ticket', 'create', '--title=Test',
@@ -204,3 +225,79 @@ def test_ticket_upload(self):
                                 args=({"filename": "a_file_name",
                                        "data": b"ticket attached data"},),
                                 identifier=1)
+
+    def test_init_ticket_results(self):
+        ticket_mgr = TicketManager(self.client)
+        ticket_table = ticket.get_ticket_results(ticket_mgr, 100)
+        self.assert_called_with('SoftLayer_Ticket', 'getObject', identifier=100)
+        self.assertIsInstance(ticket_table, formatting.KeyValueTable)
+
+        ticket_object = ticket_table.to_python()
+        self.assertEqual('No Priority', ticket_object['priority'])
+        self.assertEqual(100, ticket_object['id'])
+
+    def test_init_ticket_results_asigned_user(self):
+        mock = self.set_mock('SoftLayer_Ticket', 'getObject')
+        mock.return_value = {
+            "id": 100,
+            "title": "Simple Title",
+            "priority": 1,
+            "assignedUser": {
+                "firstName": "Test",
+                "lastName": "User"
+            },
+            "status": {
+                "name": "Closed"
+            },
+            "createDate": "2013-08-01T14:14:04-07:00",
+            "lastEditDate": "2013-08-01T14:16:47-07:00",
+            "updates": [{'entry': 'a bot says something'}]
+        }
+
+        ticket_mgr = TicketManager(self.client)
+        ticket_table = ticket.get_ticket_results(ticket_mgr, 100)
+        self.assert_called_with('SoftLayer_Ticket', 'getObject', identifier=100)
+        self.assertIsInstance(ticket_table, formatting.KeyValueTable)
+
+        ticket_object = ticket_table.to_python()
+        self.assertEqual('Severity 1 - Critical Impact / Service Down', ticket_object['priority'])
+        self.assertEqual('Test User', ticket_object['user'])
+
+    def test_ticket_summary(self):
+        mock = self.set_mock('SoftLayer_Account', 'getObject')
+        mock.return_value = {
+            'openTicketCount': 1,
+            'closedTicketCount': 2,
+            'openBillingTicketCount': 3,
+            'openOtherTicketCount': 4,
+            'openSalesTicketCount': 5,
+            'openSupportTicketCount': 6,
+            'openAccountingTicketCount': 7
+        }
+        expected = [
+            {'Status': 'Open',
+             'count': [
+                {'Type': 'Accounting', 'count': 7},
+                {'Type': 'Billing', 'count': 3},
+                {'Type': 'Sales', 'count': 5},
+                {'Type': 'Support', 'count': 6},
+                {'Type': 'Other', 'count': 4},
+                {'Type': 'Total', 'count': 1}]},
+            {'Status': 'Closed', 'count': 2}
+        ]
+        result = self.run_command(['ticket', 'summary'])
+        self.assert_no_fail(result)
+        self.assert_called_with('SoftLayer_Account', 'getObject')
+        self.assertEqual(expected, json.loads(result.output))
+
+    def test_ticket_update(self):
+        result = self.run_command(['ticket', 'update', '100', '--body=Testing'])
+        self.assert_no_fail(result)
+        self.assert_called_with('SoftLayer_Ticket', 'addUpdate', args=({'entry': 'Testing'},), identifier=100)
+
+    @mock.patch('click.edit')
+    def test_ticket_update_no_body(self, edit_mock):
+        edit_mock.return_value = 'Testing1'
+        result = self.run_command(['ticket', 'update', '100'])
+        self.assert_no_fail(result)
+        self.assert_called_with('SoftLayer_Ticket', 'addUpdate', args=({'entry': 'Testing1'},), identifier=100)