From 64b1b830d60ee842ad1060fd113ed32abbf1dd19 Mon Sep 17 00:00:00 2001 From: Ozzieisaacs Date: Sun, 25 Nov 2018 13:29:58 +0100 Subject: [PATCH] Fix #712 --- cps/helper.py | 8 +- test/Calibre-Web TestSummary.html | 479 ++++++++++++++++++++++++------ 2 files changed, 384 insertions(+), 103 deletions(-) diff --git a/cps/helper.py b/cps/helper.py index 43fb8520..d74318bf 100644 --- a/cps/helper.py +++ b/cps/helper.py @@ -123,13 +123,13 @@ def check_send_to_kindle(entry): # no converter - only for mobi and pdf formats for ele in iter(entry.data): if 'MOBI' in ele.format: - bookformats.append({'format':'Mobi','text':_('Send %(format)s to Kindle',format='Mobi')}) + bookformats.append({'format':'Mobi','convert':0,'text':_('Send %(format)s to Kindle',format='Mobi')}) if 'PDF' in ele.format: - bookformats.append({'format':'Pdf','text':_('Send %(format)s to Kindle',format='Pdf')}) + bookformats.append({'format':'Pdf','convert':0,'text':_('Send %(format)s to Kindle',format='Pdf')}) if 'AZW' in ele.format: - bookformats.append({'format':'Azw','text':_('Send %(format)s to Kindle',format='Azw')}) + bookformats.append({'format':'Azw','convert':0,'text':_('Send %(format)s to Kindle',format='Azw')}) if 'AZW3' in ele.format: - bookformats.append({'format':'Azw3','text':_('Send %(format)s to Kkindle',format='Azw3')}) + bookformats.append({'format':'Azw3','convert':0,'text':_('Send %(format)s to Kindle',format='Azw3')}) else: formats = list() for ele in iter(entry.data): diff --git a/test/Calibre-Web TestSummary.html b/test/Calibre-Web TestSummary.html index e9503755..2feb61b8 100644 --- a/test/Calibre-Web TestSummary.html +++ b/test/Calibre-Web TestSummary.html @@ -32,15 +32,15 @@
-

Start Time: 2018-11-25 12:06:17.948456

+

Start Time: 2018-11-25 12:57:57.569980

-

Stop Time: 2018-11-25 12:24:09.768645

+

Stop Time: 2018-11-25 13:16:06.314449

-

Duration: 0:17:51.820189

+

Duration: 0:18:08.744469

@@ -1554,6 +1554,287 @@ AssertionError: 'The camicdemo' != '\n ' + + test_ebook_convert.test_ebook_convert + 12 + 1 + 0 + 0 + 11 + + Detail + + + + +
test_SSL_smtp_setup_error
+ + +
+ SKIP +
+ + + + + + + +
test_STARTTLS_smtp_setup_error
+ + +
+ SKIP +
+ + + + + + + +
test_convert_deactivate
+ + +
+ SKIP +
+ + + + + + + +
test_convert_email
+ + +
+ SKIP +
+ + + + + + + +
test_convert_failed_and_email
+ + +
+ SKIP +
+ + + + + + + +
test_convert_only
+ + +
+ SKIP +
+ + + + + + + +
test_convert_parameter
+ + +
+ SKIP +
+ + + + + + + +
test_convert_wrong_excecutable
+ + PASS + + + +
test_email_failed
+ + +
+ SKIP +
+ + + + + + + +
test_email_only
+ + +
+ SKIP +
+ + + + + + + +
test_kindle_send_not_configured
+ + +
+ SKIP +
+ + + + + + + +
test_smtp_setup_error
+ + +
+ SKIP +
+ + + + + test_login.test_login 6 @@ -1562,45 +1843,45 @@ AssertionError: 'The camicdemo' != '\n ' 0 0 - Detail + Detail - +
test_login_capital_letters_user_unicode_password_passwort
PASS - +
test_login_delete_admin
PASS - +
test_login_empty_password
PASS - +
test_login_protected
- FAIL + FAIL
-