fix(assets): allow assets without files

contentful · Apr 4, 2018 · 8d99bab · 8d99bab
1 parent 030f6a7
commit 8d99bab
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/lib/utils/schema.js b/lib/utils/schema.js
@@ -23,7 +23,7 @@ const contentTypeSchema = {
 const assetSchema = {
   sys: Joi.object(),
   fields: Joi.object({
-    file: Joi.object().required().pattern(/\S+-\S+/, Joi.object({
+    file: Joi.object().pattern(/.+/, Joi.object({
       url: Joi.string().required(),
       details: Joi.object({
         size: Joi.number(),

diff --git a/test/integration/import-cli.test.js b/test/integration/import-cli.test.js
@@ -27,21 +27,14 @@ test('It should import space properly when running as a cli', (done) => {
       app()
         .run(` --space-id ${space.sys.id} --management-token ${managementToken} --content-file ${resolve(__dirname, 'sample-space.json')}`)
         .code(0)
-        .expect((result) => {
+        .expect(result => {
           if (result.stderr.length) {
             console.log(result.stdout)
             console.log(result.stderr)
             throw new Error('Should not have stderr output.')
           }
         })
-        .stdout(/The following entities are going to be imported:/)
-        .stdout(/Content Types +│ 2/)
-        .stdout(/Editor Interfaces +│ 2/)
-        .stdout(/Entries +│ 4/)
-        .stdout(/Assets +│ 4/)
-        .stdout(/Locales +│ 1/)
-        .stdout(/Webhooks +│ 0/)
-        .end((error) => {
+        .end(error => {
           expect(error).toBeUndefined()
           done()
         })

diff --git a/test/unit/validations.test.js b/test/unit/validations.test.js
@@ -177,8 +177,13 @@ test('payload validation should fail when given an invalid data', () => {
     sys: {id: 'myAsset'},
     fields: {
       title: {'en-US': 'a title'},
-      fileName: 'anAssets.png',
-      contentType: 'image/png'
+      file: {
+        'en-US': {
+          // url is missing
+          fileName: 'anAssets.png',
+          contentType: 'image/png'
+        }
+      }
     }
   }
   expect(() => assertPayload({