From: Radek Czajka <rczajka@rczajka.pl>
Date: Mon, 4 Feb 2019 21:17:08 +0000 (+0100)
Subject: Merge commit 'afb3cc28'
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/540e76dd8e04d7bab431da696565e826788bd218?ds=sidebyside;hp=-c

Merge commit 'afb3cc28'
---

540e76dd8e04d7bab431da696565e826788bd218
diff --combined src/api/tests/res/responses/books.json
index fb3d39abd,80414b5e1..cfd5ee3dd
--- a/src/api/tests/res/responses/books.json
+++ b/src/api/tests/res/responses/books.json
@@@ -4,12 -4,12 +4,12 @@@
          "full_sort_key": "$child$2", 
          "cover_color": "#000000", 
          "author": "", 
 -        "url": "https://example.com/katalog/lektura/child/", 
 +        "url": "http://testserver/katalog/lektura/child/",
          "has_audio": false, 
          "title": "Child", 
          "cover": "", 
          "epoch": "", 
 -        "href": "https://example.com/api/books/child/", 
 +        "href": "http://testserver/api/books/child/",
          "genre": "Wiersz", 
          "simple_thumb": "", 
          "slug": "child", 
@@@ -20,12 -20,12 +20,12 @@@
          "full_sort_key": "$grandchild$3", 
          "cover_color": "#000000", 
          "author": "", 
 -        "url": "https://example.com/katalog/lektura/grandchild/", 
 +        "url": "http://testserver/katalog/lektura/grandchild/",
          "has_audio": false, 
          "title": "Grandchild", 
          "cover": "", 
          "epoch": "", 
 -        "href": "https://example.com/api/books/grandchild/", 
 +        "href": "http://testserver/api/books/grandchild/",
          "genre": "Sonet", 
          "simple_thumb": "", 
          "slug": "grandchild", 
@@@ -36,15 -36,15 +36,15 @@@
          "full_sort_key": "john doe$parent$1", 
          "cover_color": "#a6820a", 
          "author": "John Doe", 
 -        "url": "https://example.com/katalog/lektura/parent/", 
 +        "url": "http://testserver/katalog/lektura/parent/",
          "has_audio": true, 
          "title": "Parent", 
          "cover": "cover/parent.jpg", 
          "epoch": "Barok", 
 -        "href": "https://example.com/api/books/parent/", 
 +        "href": "http://testserver/api/books/parent/",
          "genre": "Sonet", 
 -        "simple_thumb": "https://example.com/media/cover_api_thumb/parent.jpg", 
 +        "simple_thumb": "http://testserver/media/cover_api_thumb/parent.jpg",
          "slug": "parent", 
-         "cover_thumb": "http://testserver/media/cover/parent.jpg-139x193"
+         "cover_thumb": "cover_thumb/parent.jpg"
      }
  ]
diff --combined src/catalogue/fixtures/test-books.yaml
index 88dfccbdb,4c607758a..42eefd761
--- a/src/catalogue/fixtures/test-books.yaml
+++ b/src/catalogue/fixtures/test-books.yaml
@@@ -1,4 -1,3 +1,4 @@@
 +
  - model: catalogue.book
    pk: 1
    fields:
@@@ -13,6 -12,7 +13,7 @@@
      cover: cover/parent.jpg
      cover_api_thumb: cover_api_thumb/parent.jpg
      simple_cover: simple_cover/parent.jpg
+     cover_thumb: cover_thumb/parent.jpg
      recommended: true
      created_at: "1970-01-03 0:0Z"
      changed_at: "1970-01-03 0:0Z"
@@@ -31,16 -31,11 +32,16 @@@
    fields:
      slug: grandchild
      title: Grandchild
 +    preview: true
      sort_key: grandchild
      parent: 2
 -    txt_file: txt/grandchild.txt
 -    html_file: html/grandchild.html
 -    fb2_file: fb2/grandchild.fb2
 +    xml_file: secret/grandchild.xml
 +    txt_file: secret/grandchild.txt
 +    html_file: secret/grandchild.html
 +    epub_file: secret/grandchild.epub
 +    mobi_file: secret/grandchild.mobi
 +    pdf_file: secret/grandchild.pdf
 +    fb2_file: secret/grandchild.fb2
      created_at: "1970-01-01 0:0Z"
      changed_at: "1970-01-01 0:0Z"
  
@@@ -139,7 -134,7 +140,7 @@@
      uploaded_at: "1970-01-03 0:0Z"
  
  - model: catalogue.fragment
 -  id: 1
 +  pk: 1
    fields:
      short_text: "Fragment"
      text: "A fragment"