chore: fix and run the linter (#357)

googleapis · Nov 7, 2018 · bd5fdab · bd5fdab
1 parent 76f53ac
commit bd5fdab
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 24 deletions.
diff --git a/package.json b/package.json
@@ -51,11 +51,10 @@
     "test-no-cover": "mocha test/*.js",
     "test": "npm run cover",
     "generate-scaffolding": "repo-tools generate all && repo-tools generate lib_samples_readme -l samples/ --config ../.cloud-repo-tools.json",
-    "lint": "eslint src/ samples/ system-test/ test/",
-    "prettier": "prettier --write src/*.js src/*/*.js samples/*.js samples/*/*.js test/*.js test/*/*.js system-test/*.js system-test/*/*.js",
+    "lint": "eslint '**/*.js'",
     "system-test": "mocha system-test/*.js --timeout 600000",
     "snippet-test": "mocha samples/document-snippets/tests/*.js --timeout 600000",
-    "fix": "eslint --fix '**/*.js' && npm run prettier"
+    "fix": "eslint --fix '**/*.js'"
   },
   "dependencies": {
     "@google-cloud/common-grpc": "^0.9.0",

diff --git a/synth.py b/synth.py
@@ -17,4 +17,4 @@
 s.copy(templates)
 
 subprocess.run(['npm', 'install'])
-subprocess.run(['npm', 'run', 'prettier'])
+subprocess.run(['npm', 'run', 'fix'])
diff --git a/system-test/read-rows-acceptance-tests.js b/system-test/read-rows-acceptance-tests.js
@@ -56,27 +56,29 @@ describe('Read Row Acceptance tests', function() {
       const results = [];
       const rawResults = test.results || [];
       const errorCount = rawResults.filter(result => result.error).length;
-      rawResults.filter(result => !result.error).forEach(result => {
-        const existingRow = results.find(filter => filter.key === result.rk);
-        const row = existingRow || {key: result.rk, data: {}};
-        const data = row.data;
-        if (typeof existingRow === 'undefined') {
-          results.push(row);
-        }
-        const family = data[result.fm] || {};
-        data[result.fm] = family;
-        const qualifier = family[result.qual] || [];
-        family[result.qual] = qualifier;
-        const resultLabels = [];
-        if (result.label !== '') {
-          resultLabels.push(result.label);
-        }
-        qualifier.push({
-          value: result.value,
-          timestamp: '' + result.ts,
-          labels: resultLabels,
+      rawResults
+        .filter(result => !result.error)
+        .forEach(result => {
+          const existingRow = results.find(filter => filter.key === result.rk);
+          const row = existingRow || {key: result.rk, data: {}};
+          const data = row.data;
+          if (typeof existingRow === 'undefined') {
+            results.push(row);
+          }
+          const family = data[result.fm] || {};
+          data[result.fm] = family;
+          const qualifier = family[result.qual] || [];
+          family[result.qual] = qualifier;
+          const resultLabels = [];
+          if (result.label !== '') {
+            resultLabels.push(result.label);
+          }
+          qualifier.push({
+            value: result.value,
+            timestamp: '' + result.ts,
+            labels: resultLabels,
+          });
         });
-      });
 
       table.bigtable = {};
       table.bigtable.request = function() {