From 4b2659e70fa05a8cf511454f8433c690a2553387 Mon Sep 17 00:00:00 2001 From: gabrielburnworth Date: Tue, 18 Apr 2023 13:12:36 -0700 Subject: [PATCH 1/2] upgrade deps --- Gemfile.lock | 26 ++++++++++++++------------ package.json | 28 ++++++++++++++-------------- 2 files changed, 28 insertions(+), 26 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 0ef0a7efc7..c0b61f3188 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -71,7 +71,7 @@ GEM minitest (>= 5.1) tzinfo (~> 2.0) zeitwerk (~> 2.3) - addressable (2.8.1) + addressable (2.8.4) public_suffix (>= 2.0.2, < 6.0) amq-protocol (2.3.2) bcrypt (3.1.18) @@ -82,8 +82,9 @@ GEM case_transform (0.2) activesupport climate_control (1.2.0) - codecov (0.6.0) - simplecov (>= 0.15, < 0.22) + codecov (0.2.12) + json + simplecov coderay (1.1.3) concurrent-ruby (1.2.2) crass (1.0.6) @@ -100,7 +101,7 @@ GEM delayed_job_active_record (4.1.7) activerecord (>= 3.0, < 8.0) delayed_job (>= 3.0, < 5) - devise (4.9.0) + devise (4.9.2) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0) @@ -119,7 +120,7 @@ GEM factory_bot_rails (6.2.0) factory_bot (~> 6.2.0) railties (>= 5.0.0) - faker (3.1.1) + faker (3.2.0) i18n (>= 1.8.11, < 2) faraday (1.10.3) faraday-em_http (~> 1.0) @@ -175,7 +176,7 @@ GEM google-cloud-core (~> 1.6) googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) - googleauth (1.5.0) + googleauth (1.5.2) faraday (>= 0.17.3, < 3.a) jwt (>= 1.4, < 3.0) memoist (~> 0.16) @@ -187,6 +188,7 @@ GEM httpclient (2.8.3) i18n (1.12.0) concurrent-ruby (~> 1.0) + json (2.6.3) jsonapi-renderer (0.2.2) jwt (2.7.0) kaminari (1.2.2) @@ -206,7 +208,7 @@ GEM activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.19.1) + loofah (2.20.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.8.1) @@ -232,8 +234,8 @@ GEM timeout net-smtp (0.3.3) net-protocol - nio4r (2.5.8) - nokogiri (1.14.2-x86_64-linux) + nio4r (2.5.9) + nokogiri (1.14.3-x86_64-linux) racc (~> 1.4) orm_adapter (0.5.0) os (1.1.4) @@ -316,7 +318,7 @@ GEM rspec-expectations (3.12.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) - rspec-mocks (3.12.4) + rspec-mocks (3.12.5) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) rspec-rails (6.0.1) @@ -341,7 +343,7 @@ GEM faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) - simplecov (0.21.2) + simplecov (0.22.0) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) @@ -424,4 +426,4 @@ RUBY VERSION ruby 3.0.5p211 BUNDLED WITH - 2.4.7 + 2.4.12 diff --git a/package.json b/package.json index 150c9511e9..c9a8769a66 100644 --- a/package.json +++ b/package.json @@ -34,30 +34,30 @@ "@blueprintjs/core": "4.17.8", "@blueprintjs/popover2": "1.13.12", "@blueprintjs/select": "4.9.12", - "@monaco-editor/react": "4.4.6", + "@monaco-editor/react": "4.5.0", "@parcel/transformer-sass": "2.8.3", "@parcel/transformer-typescript-tsc": "2.8.3", - "@types/lodash": "4.14.191", + "@types/lodash": "4.14.194", "@types/markdown-it": "12.2.3", - "@types/node": "18.15.10", + "@types/node": "18.15.11", "@types/promise-timeout": "1.3.0", "@types/react": "18.0.30", "@types/react-color": "3.0.6", "@types/react-dom": "18.0.11", "@types/ws": "8.5.4", - "axios": "1.3.4", + "axios": "1.3.5", "bowser": "2.11.0", "browser-speech": "1.1.1", "events": "3.3.0", "farmbot": "15.6.1", - "i18next": "22.4.13", + "i18next": "22.4.14", "lodash": "4.17.21", "markdown-it": "13.0.1", "markdown-it-emoji": "2.0.2", "moment": "2.29.4", - "monaco-editor": "0.36.1", + "monaco-editor": "0.37.1", "mqtt": "4.3.7", - "npm": "9.6.2", + "npm": "9.6.4", "parcel": "2.8.3", "process": "0.11.10", "promise-timeout": "1.3.0", @@ -71,20 +71,20 @@ "redux-immutable-state-invariant": "2.1.0", "redux-thunk": "2.4.2", "takeme": "0.12.0", - "typescript": "5.0.2", + "typescript": "5.0.4", "url": "0.11.0", "xterm": "5.1.0" }, "devDependencies": { "@types/enzyme": "3.10.12", "@types/jest": "29.5.0", - "@typescript-eslint/eslint-plugin": "5.57.0", - "@typescript-eslint/parser": "5.57.0", + "@typescript-eslint/eslint-plugin": "5.59.0", + "@typescript-eslint/parser": "5.59.0", "cheerio": "1.0.0-rc.10", "coveralls": "3.1.1", "enzyme": "3.11.0", "enzyme-adapter-react-16": "1.15.7", - "eslint": "8.36.0", + "eslint": "8.38.0", "eslint-plugin-eslint-comments": "3.2.0", "eslint-plugin-import": "2.27.5", "eslint-plugin-jest": "27.2.1", @@ -95,7 +95,7 @@ "jest": "29.5.0", "jest-cli": "29.5.0", "jest-environment-jsdom": "29.5.0", - "jest-junit": "15.0.0", + "jest-junit": "16.0.0", "jest-skipped-reporter": "0.0.5", "jshint": "2.13.6", "madge": "6.0.0", @@ -103,9 +103,9 @@ "raf": "3.4.1", "react-addons-test-utils": "15.6.2", "react-test-renderer": "16.13.1", - "sass": "1.60.0", + "sass": "1.62.0", "sass-lint": "1.13.1", - "ts-jest": "29.0.5", + "ts-jest": "29.1.0", "tslint": "6.1.3" } } From ec41ec3cfb4260b5d7a2402cb3b39e2712aa547a Mon Sep 17 00:00:00 2001 From: gabrielburnworth Date: Tue, 18 Apr 2023 14:23:35 -0700 Subject: [PATCH 2/2] fix ruby test url content --- .../farmware_installations_controller_spec.rb | 2 +- spec/factories/farmware_installations.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/controllers/api/farmware_installations/farmware_installations_controller_spec.rb b/spec/controllers/api/farmware_installations/farmware_installations_controller_spec.rb index 63308216be..50af6dbea0 100644 --- a/spec/controllers/api/farmware_installations/farmware_installations_controller_spec.rb +++ b/spec/controllers/api/farmware_installations/farmware_installations_controller_spec.rb @@ -7,7 +7,7 @@ describe "#create" do it "creates a new FarmwareInstallation" do sign_in user - url = Faker::Internet.url + "/manifest.json" + url = Faker::Internet.url host: "example.com", path: "/#{SecureRandom.hex(16)}/manifest.json" payload = { url: url } old_installation_count = FarmwareInstallation.count post :create, body: payload.to_json, params: { format: :json } diff --git a/spec/factories/farmware_installations.rb b/spec/factories/farmware_installations.rb index 85f874935c..7fbcf65b16 100644 --- a/spec/factories/farmware_installations.rb +++ b/spec/factories/farmware_installations.rb @@ -1,6 +1,6 @@ FactoryBot.define do factory :farmware_installation do device - url { Faker::Internet.url + "/manifest.json" } + url { Faker::Internet.url host: "example.com", path: "/#{SecureRandom.hex(16)}/manifest.json" } end end