todos cleanup (gitcoinco#1158)

* remove property keywords * remove campaign dashboards controller * update solargraph config * remove coupons * ci tweak * update codecov config and system test setup * update codecov
andrewmcodes · Mar 12, 2020 · 9b00247 · 9b00247
1 parent 2f5e464
commit 9b00247
Show file tree

Hide file tree

Showing 24 changed files with 44 additions and 266 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -23,11 +23,14 @@ jobs:
     working_directory: ~/repo
     steps:
       - checkout
+      - run:
+          name: Set up assets cache key
+          command: find app/javascript -type f | xargs -d'\n' -P0 -n1 md5sum | sort -k 2 | md5sum > dependency_checksum
       - run: |
           sudo curl -sL https://deb.nodesource.com/setup_13.x | sudo bash -
           curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
           echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
-          sudo apt-get update && sudo apt-get install -y postgresql-client nodejs yarn
+          sudo apt-get update && sudo apt-get install -y libpq-dev postgresql-client nodejs yarn
       - restore_cache:
           name: Restore gem cache
           keys:
@@ -42,9 +45,6 @@ jobs:
             - yarn-cache-v5-{{ arch }}-{{ .Branch }}
             - yarn-cache-v5-{{ arch }}
             - yarn-cache-v5
-      - run:
-          name: Set up assets cache key
-          command: find app/javascript -type f -exec md5sum {} \; > dependency_checksum
       - restore_cache:
           name: Restore assets cache
           keys:

diff --git a/.solargraph.yml b/.solargraph.yml
@@ -9,7 +9,6 @@ exclude:
 require: []
 domains: []
 reporters:
-- rubocop
 - require_not_found
 require_paths: []
 max_files: 10000
diff --git a/app/controllers/campaign_dashboards_controller.rb b/app/controllers/campaign_dashboards_controller.rb
diff --git a/app/controllers/coupons_controller.rb b/app/controllers/coupons_controller.rb
diff --git a/app/controllers/property_keywords_controller.rb b/app/controllers/property_keywords_controller.rb
diff --git a/app/helpers/campaign_dashboards_helper.rb b/app/helpers/campaign_dashboards_helper.rb
diff --git a/app/helpers/coupons_helper.rb b/app/helpers/coupons_helper.rb
diff --git a/app/helpers/property_keywords_helper.rb b/app/helpers/property_keywords_helper.rb
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -166,8 +166,7 @@ class User < ApplicationRecord
     # rescue required for initial migration due to devise
     ActiveRecord::NoDatabaseError
   end
-  # TODO: do we want to remove timeoutable?
-  # https://github.com/gitcoinco/code_fund_ads/blob/8750ecdf213dc8ef01fbfb210c809f9bcff52e6f/app/models/user.rb
+
   devise(
     :confirmable,
     :database_authenticatable,

diff --git a/app/views/campaign_dashboards/show.html.erb b/app/views/campaign_dashboards/show.html.erb
diff --git a/app/views/coupons/_form.html.erb b/app/views/coupons/_form.html.erb
diff --git a/app/views/coupons/_table.html.erb b/app/views/coupons/_table.html.erb
diff --git a/app/views/coupons/_tr.html.erb b/app/views/coupons/_tr.html.erb
diff --git a/app/views/coupons/edit.html.erb b/app/views/coupons/edit.html.erb
diff --git a/app/views/coupons/index.html.erb b/app/views/coupons/index.html.erb
diff --git a/app/views/coupons/new.html.erb b/app/views/coupons/new.html.erb
diff --git a/app/views/property_keywords/show.html.erb b/app/views/property_keywords/show.html.erb
diff --git a/codecov.yml b/codecov.yml
@@ -1,9 +1,29 @@
 codecov:
-  bot: "codecov-T-800"
   require_ci_to_pass: yes
   notify:
-    after_n_builds: 2
     wait_for_ci: yes
-  parsers:
-    v1:
-      include_full_missed_files: true
+
+coverage:
+  precision: 2
+  round: down
+  range: "70...100"
+
+parsers:
+  gcov:
+    branch_detection:
+      conditional: yes
+      loop: yes
+      method: no
+      macro: no
+
+comment:
+  layout: "reach,diff,flags,tree"
+  behavior: default
+  require_changes: yes
+
+ignore:
+  - "bin/"
+  - "config/"
+  - "db/"
+  - "docs/"
+  - "public/"
diff --git a/config/webpack/loaders/erb.js b/config/webpack/loaders/erb.js
@@ -2,10 +2,14 @@ module.exports = {
   test: /\.erb$/,
   enforce: 'pre',
   exclude: /node_modules/,
-  use: [{
-    loader: 'rails-erb-loader',
-    options: {
-      runner: (/^win/.test(process.platform) ? 'ruby ' : '') + 'bin/rails runner'
+  use: [
+    {
+      loader: 'rails-erb-loader',
+      options: {
+        runner:
+          (/^win/.test(process.platform) ? 'ruby ' : '') + 'bin/rails runner',
+        env: { ...process.env }
+      }
     }
-  }]
+  ]
 }
diff --git a/package.json b/package.json
@@ -10,9 +10,9 @@
     "contributors:add": "all-contributors add",
     "contributors:generate": "all-contributors generate",
     "webpack:analyze": "mkdir -p public/packs && node_modules/.bin/webpack --config config/webpack/production.js --profile --json > public/packs/stats.json && node_modules/.bin/webpack-bundle-analyzer public/packs/stats.json",
-    "prettier:format": "prettier-standard -- \"app/**/*.js\" \"app/**/*.scss\"",
-    "prettier:check": "prettier-standard -- --check \"app/**/*.js\" \"app/**/*.scss\"",
-    "prettier:lint": "prettier-standard -- --lint \"app/**/*.js\" \"app/**/*.scss\""
+    "prettier:format": "prettier-standard -- \"app/**/*.js\" \"config/**/*.js\" \"app/**/*.scss\"",
+    "prettier:check": "prettier-standard -- --check \"app/**/*.js\" \"config/**/*.js\" \"app/**/*.scss\"",
+    "prettier:lint": "prettier-standard -- --lint \"app/**/*.js\" \"config/**/*.js\" \"app/**/*.scss\""
   },
   "dependencies": {
     "@fnando/sparkline": "^0.3.10",

diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb
@@ -6,8 +6,9 @@
   Capybara::Cuprite::Driver.new(
     app,
     window_size: [1400, 1400],
-    js_errors: true,
+    js_errors: false,
     headless: !(ENV["WATCH"] == "true"),
+    process_timeout: 5
   )
 end
 

diff --git a/test/controllers/campaign_dashboards_controller_test.rb b/test/controllers/campaign_dashboards_controller_test.rb
diff --git a/test/controllers/coupons_controller_test.rb b/test/controllers/coupons_controller_test.rb
diff --git a/test/controllers/property_keywords_controller_test.rb b/test/controllers/property_keywords_controller_test.rb