Merge pull request #1301 from peuter/clean-fixtures

remove fixture files with specials chars and use an index-file
CometVisu · Dec 27, 2022 · f5ac111 · f5ac111
2 parents a3afb9a + 290cdac
commit f5ac111
Show file tree

Hide file tree

Showing 10 changed files with 115 additions and 82 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -138,14 +138,16 @@ function mock(verbose) {
       }));
       res.end();
     } else if (url.indexOf('/rest/manager/index.php/') >= 0) {
-      const relPath = req.url.substr(req.url.indexOf('/rest/manager/index.php/'));
+      const relPath = url.substr(url.indexOf('/rest/manager/index.php/') + '/rest/manager/index.php/'.length);
       if (req.method === 'GET') {
-        if (fs.existsSync(path.join("source", "test", "fixtures", relPath))) {
-          const data = fs.readFileSync(path.join("source", "test", "fixtures", relPath), 'utf8');
-          res.writeHead(200, {'Content-Type': 'application/json'});
-          res.write(data);
+        const index = JSON.parse(fs.readFileSync(path.join("source", "test", "fixtures", "rest", "manager", "index.php", "index.json")));
+        if (index[relPath]) {
+          const data = index[relPath].data;
+          res.writeHead(200, {'Content-Type': index[relPath].mimeType || 'application/json'});
+          res.write(JSON.stringify(data));
           res.end();
         } else {
+          console.log(relPath, 'not found');
           next();
         }
       } else if (req.method === 'PUT') {

diff --git a/...fig/widgets/switch/_static/de_config_widgets_switch_index_editor_attributes.png b/...fig/widgets/switch/_static/de_config_widgets_switch_index_editor_attributes.png
diff --git a/...onfig/widgets/switch/_static/de_config_widgets_switch_index_editor_elements.png b/...onfig/widgets/switch/_static/de_config_widgets_switch_index_editor_elements.png
diff --git a/source/test/fixtures/rest/manager/index.php/data/designs b/source/test/fixtures/rest/manager/index.php/data/designs
diff --git a/source/test/fixtures/rest/manager/index.php/fs/check b/source/test/fixtures/rest/manager/index.php/fs/check
diff --git a/source/test/fixtures/rest/manager/index.php/fs?path=. b/source/test/fixtures/rest/manager/index.php/fs?path=.
diff --git a/source/test/fixtures/rest/manager/index.php/fs?path=backup b/source/test/fixtures/rest/manager/index.php/fs?path=backup
diff --git a/source/test/fixtures/rest/manager/index.php/fs?path=demo b/source/test/fixtures/rest/manager/index.php/fs?path=demo
diff --git a/source/test/fixtures/rest/manager/index.php/fs?path=media b/source/test/fixtures/rest/manager/index.php/fs?path=media
diff --git a/source/test/fixtures/rest/manager/index.php/index.json b/source/test/fixtures/rest/manager/index.php/index.json
@@ -0,0 +1,108 @@
+{
+  "fs?path=media": {
+    "data": [],
+    "mimeType": "application/json"
+  },
+  "fs?path=demo": {
+    "data": [],
+    "mimeType": "application/json"
+  },
+  "fs?path=backup": {
+    "data": [],
+    "mimeType": "application/json"
+  },
+  "fs?path=.": {
+    "data": [
+      {"name":"hidden.php","type":"file","parentFolder":"","hasChildren":false,"readable":true,"writeable":true,"trash":false,"inTrash":false,"mounted":false},
+      {"name":"visu_config.xml","type":"file","parentFolder":"","hasChildren":false,"readable":true,"writeable":true,"trash":false,"inTrash":false,"mounted":false},
+      {"name":"visu_config_mockup.xml","type":"file","parentFolder":"","hasChildren":false,"readable":true,"writeable":true,"trash":false,"inTrash":false,"mounted":false},
+      {"name":"media","type":"dir","parentFolder":"","hasChildren":false,"readable":true,"writeable":true,"trash":false,"inTrash":false,"mounted":false},
+      {"name":"demo","type":"dir","mounted":true,"parentFolder":"","hasChildren":true,"readable":true,"writeable":false},
+      {"name":".trash","type":"dir","mounted":false,"parentFolder":"","hasChildren":false,"readable":true,"writeable":false,"trash":true}
+    ],
+    "mimeType": "application/json"
+  },
+  "fs": {
+    "data": [
+      {"name":"hidden.php","type":"file","parentFolder":"","hasChildren":false,"readable":true,"writeable":true,"trash":false,"inTrash":false,"mounted":false},
+      {"name":"visu_config.xml","type":"file","parentFolder":"","hasChildren":false,"readable":true,"writeable":true,"trash":false,"inTrash":false,"mounted":false},
+      {"name":"visu_config_mockup.xml","type":"file","parentFolder":"","hasChildren":false,"readable":true,"writeable":true,"trash":false,"inTrash":false,"mounted":false},
+      {"name":"media","type":"dir","parentFolder":"","hasChildren":false,"readable":true,"writeable":true,"trash":false,"inTrash":false,"mounted":false},
+      {"name":"demo","type":"dir","mounted":true,"parentFolder":"","hasChildren":true,"readable":true,"writeable":false},
+      {"name":".trash","type":"dir","mounted":false,"parentFolder":"","hasChildren":false,"readable":true,"writeable":false,"trash":true}
+    ],
+    "mimeType": "application/json"
+  },
+  "fs/check": {
+    "data": [
+      {
+        "name": "hidden.php",
+        "type": "file",
+        "parentFolder": "",
+        "hasChildren": false,
+        "readable": true,
+        "writeable": true,
+        "trash": false,
+        "inTrash": false,
+        "mounted": false
+      },
+      {
+        "name": "visu_config.xml",
+        "type": "file",
+        "parentFolder": "",
+        "hasChildren": false,
+        "readable": true,
+        "writeable": true,
+        "trash": false,
+        "inTrash": false,
+        "mounted": false
+      },
+      {
+        "name": "visu_config_mockup.xml",
+        "type": "file",
+        "parentFolder": "",
+        "hasChildren": false,
+        "readable": true,
+        "writeable": true,
+        "trash": false,
+        "inTrash": false,
+        "mounted": false
+      },
+      {
+        "name": "media",
+        "type": "dir",
+        "parentFolder": "",
+        "hasChildren": false,
+        "readable": true,
+        "writeable": true,
+        "trash": false,
+        "inTrash": false,
+        "mounted": false
+      },
+      {
+        "name": "demo",
+        "type": "dir",
+        "mounted": true,
+        "parentFolder": "",
+        "hasChildren": true,
+        "readable": true,
+        "writeable": false
+      },
+      {
+        "name": ".trash",
+        "type": "dir",
+        "mounted": false,
+        "parentFolder": "",
+        "hasChildren": false,
+        "readable": true,
+        "writeable": false,
+        "trash": true
+      }
+    ],
+    "mimeType": "application/json"
+  },
+  "data/designs": {
+    "data": ["pure", "metal", "alaska"],
+    "mimeType": "application/json"
+  }
+}