fix lint and test

guardian · Oct 22, 2019 · b1a0800 · b1a0800
1 parent 1c648a0
commit b1a0800
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 15 deletions.
diff --git a/projects/Mallard/src/components/front/image-resource.tsx b/projects/Mallard/src/components/front/image-resource.tsx
@@ -52,7 +52,7 @@ const ImageResource = ({
     image,
     style,
     setAspectRatio = false,
-    use,
+    use, //eslint-disable-line
     ...props
 }: ImageResourceProps) => {
     const [width, setWidth] = useState<number | null>(null)

diff --git a/projects/Mallard/src/components/front/items/image-items.tsx b/projects/Mallard/src/components/front/items/image-items.tsx
@@ -45,8 +45,6 @@ const imageStyles = StyleSheet.create({
 
 const ImageItem = ({ article, size, ...tappableProps }: PropTypes) => {
     const [isOpinionCard, isSportCard] = [useIsOpinionCard(), useIsSportCard()]
-    const isTablet = false
-    const trailImage = article.trailImage
     if (isOpinionCard && isSmallItem(size)) {
         return <RoundImageItem {...{ article, size, ...tappableProps }} />
     }

diff --git a/projects/Mallard/src/paths/__tests__/index.spec.ts b/projects/Mallard/src/paths/__tests__/index.spec.ts
@@ -26,12 +26,6 @@ describe('paths', () => {
             )
         })
 
-        it('should give correct media root directory', () => {
-            expect(FSPaths.mediaRoot('daily-edition/2019-10-10')).toEqual(
-                'path/to/base/directory/issues/daily-edition/2019-10-10/media',
-            )
-        })
-
         it('should give correct zip file location based on a local issue id and filename', () => {
             expect(
                 FSPaths.zip('daily-edition/2019-10-10', '2019-10-10'),
@@ -57,17 +51,35 @@ describe('paths', () => {
             )
         })
 
-        it('should give a media path on the local device', () => {
+        it('should give a media path on the local device for a full sized image', () => {
             expect(
-                FSPaths.media(
+                FSPaths.image(
                     'daily-edition/2019-10-10',
-                    'source',
-                    'path',
                     'phone',
+                    {
+                        source: 'source',
+                        path: 'path',
+                    },
+                    'full-size',
                 ),
             ).toEqual(
                 'path/to/base/directory/issues/daily-edition/2019-10-10/media/phone/source/path',
             )
         })
+        it('should give a media path on the local device for a thumbnail image', () => {
+            expect(
+                FSPaths.image(
+                    'daily-edition/2019-10-10',
+                    'phone',
+                    {
+                        source: 'source',
+                        path: 'path',
+                    },
+                    'thumb',
+                ),
+            ).toEqual(
+                'path/to/base/directory/issues/daily-edition/2019-10-10/thumbs/phone/thumb/source/path',
+            )
+        })
     })
 })
diff --git a/projects/Mallard/src/paths/index.ts b/projects/Mallard/src/paths/index.ts
@@ -35,14 +35,12 @@ export const APIPaths = {
 const issuesDir = `${RNFetchBlob.fs.dirs.DocumentDir}/issues`
 
 const issueRoot = (localIssueId: string) => `${issuesDir}/${localIssueId}`
-const imageRoot = (localIssueId: string) => `${issueRoot(localIssueId)}/images`
 export const MEDIA_CACHE_DIRECTORY_NAME = 'cached'
 
 export const FSPaths = {
     issuesDir,
     contentPrefixDir: `${issuesDir}/${defaultSettings.contentPrefix}`,
     issueRoot,
-    imageRoot,
     image: (
         localIssueId: string,
         size: ImageSize,