[PORT] Finalize move of printer_tray to base_report_to_printer,

fix tests as report param is not a string but recordset

base_report_to_printer/tests/test_printing_printer.py

@@ -31,19 +31,22 @@ class TestPrintingPrinter(TransactionCase):
             'location': 'Location',
             'uri': 'URI',
         }
+        self.report = self.env['ir.actions.report'].search([], limit=1)
 
     def new_record(self):
         return self.Model.create(self.printer_vals)
 
     def test_printing_options(self):
         """ It should generate the right options dictionnary """
-        self.assertEqual(self.Model.print_options('report', 'raw'), {
+        # TODO: None here used as report - tests here should be merged
+        # with tests in test_printing_printer_tray from when modules merged
+        self.assertEqual(self.Model.print_options(None, 'raw'), {
             'raw': 'True',
         })
-        self.assertEqual(self.Model.print_options('report', 'pdf', 2), {
+        self.assertEqual(self.Model.print_options(None, 'pdf', 2), {
             'copies': '2',
         })
-        self.assertEqual(self.Model.print_options('report', 'raw', 2), {
+        self.assertEqual(self.Model.print_options(None, 'raw', 2), {
             'raw': 'True',
             'copies': '2',
         })
@@ -55,7 +58,7 @@ class TestPrintingPrinter(TransactionCase):
         with mock.patch('%s.mkstemp' % model) as mkstemp:
             mkstemp.return_value = fd, file_name
             printer = self.new_record()
-            printer.print_document('report_name', b'content to print', 'pdf')
+            printer.print_document(self.report, b'content to print', 'pdf')
             cups.Connection().printFile.assert_called_once_with(
                 printer.system_name,
                 file_name,
@@ -72,14 +75,14 @@ class TestPrintingPrinter(TransactionCase):
             printer = self.new_record()
             with self.assertRaises(UserError):
                 printer.print_document(
-                    'report_name', b'content to print', 'pdf')
+                    self.report, b'content to print', 'pdf')
 
     @mock.patch('%s.cups' % server_model)
     def test_print_file(self, cups):
         """ It should print a file through CUPS """
         file_name = 'file_name'
         printer = self.new_record()
-        printer.print_file(file_name, 'pdf')
+        printer.print_file(file_name, report=self.report, format='pdf')
         cups.Connection().printFile.assert_called_once_with(
             printer.system_name,
             file_name,

base_report_to_printer/tests/test_printing_printer_wizard.py

@@ -26,6 +26,7 @@ class TestPrintingPrinterWizard(TransactionCase):
             'printer-make-and-model': 'Make and Model',
             'printer-location': "location",
             'device-uri': 'URI',
+            'printer-uri-supported': 'uri'
         }
 
     def _record_vals(self, sys_name='sys_name'):
@@ -52,6 +53,7 @@ class TestPrintingPrinterWizard(TransactionCase):
         cups.Connection().getPrinters.return_value = {
             'sys_name': self.printer_vals,
         }
+        cups.Connection().getPPD3.return_value = (200, 0, '')
         self.Model.action_ok()
         cups.Connection().getPrinters.assert_called_once_with()
 
@@ -68,6 +70,7 @@ class TestPrintingPrinterWizard(TransactionCase):
         cups.Connection().getPrinters.return_value = {
             'sys_name': self.printer_vals,
         }
+        cups.Connection().getPPD3.return_value = (200, 0, '')
         self.Model.action_ok()
         rec_id = self.env['printing.printer'].search([
             ('system_name', '=', 'sys_name')
@@ -89,6 +92,7 @@ class TestPrintingPrinterWizard(TransactionCase):
         cups.Connection().getPrinters.return_value = {
             'sys_name': self.printer_vals,
         }
+        cups.Connection().getPPD3.return_value = (200, 0, '')
         self.env['printing.printer'].create(
             self._record_vals()
         )

base_report_to_printer/tests/test_printing_report_xml_action.py

@@ -47,12 +47,14 @@ class TestPrintingReportXmlAction(TransactionCase):
         self.assertEqual(xml_action.behaviour(), {
             'action': xml_action.action,
             'printer': xml_action.printer_id,
+            'tray': False,
         })
 
         xml_action = self.new_record({'printer_id': self.new_printer().id})
         self.assertEqual(xml_action.behaviour(), {
             'action': xml_action.action,
             'printer': xml_action.printer_id,
+            'tray': False,
         })
 
         self.assertEqual(self.Model.behaviour(), {})