diff --git a/Gemfile.lock b/Gemfile.lock index 80d59988b..d5c33fa7a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -147,14 +147,14 @@ GEM multi_json (~> 1.11) os (>= 0.9, < 2.0) signet (~> 0.7) - hashdiff (0.3.9) + hashdiff (0.4.0) hashie (3.6.0) httpclient (2.8.3) i18n (1.6.0) concurrent-ruby (~> 1.0) json (2.2.0) jsonapi-renderer (0.2.0) - jwt (2.1.0) + jwt (2.2.1) launchy (2.4.3) addressable (~> 2.3) letter_opener (1.7.0) @@ -233,9 +233,9 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-erd (1.5.2) - activerecord (>= 3.2) - activesupport (>= 3.2) + rails-erd (1.6.0) + activerecord (>= 4.2) + activesupport (>= 4.2) choice (~> 0.2.0) ruby-graphviz (~> 1.2) rails-html-sanitizer (1.0.4) @@ -252,7 +252,7 @@ GEM rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) rake (12.3.2) - redis (4.1.1) + redis (4.1.2) representable (3.0.4) declarative (< 0.1.0) declarative-option (< 0.2.0) @@ -263,7 +263,7 @@ GEM actionpack (>= 4.2.0, < 6.0) railties (>= 4.2.0, < 6.0) retriable (3.1.2) - rollbar (2.19.4) + rollbar (2.20.1) multi_json rspec (3.8.0) rspec-core (~> 3.8.0) @@ -287,12 +287,12 @@ GEM rspec-support (~> 3.8.0) rspec-support (3.8.0) ruby-graphviz (1.2.4) - rubyzip (1.2.2) + rubyzip (1.2.3) scenic (1.5.1) activerecord (>= 4.0.0) railties (>= 4.0.0) secure_headers (6.1.0) - selenium-webdriver (3.142.2) + selenium-webdriver (3.142.3) childprocess (>= 0.5, < 2.0) rubyzip (~> 1.2, >= 1.2.2) signet (0.11.0) @@ -305,9 +305,9 @@ GEM json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.2) - skylight (4.0.1) - skylight-core (= 4.0.1) - skylight-core (4.0.1) + skylight (4.1.0) + skylight-core (= 4.1.0) + skylight-core (4.1.0) activesupport (>= 4.2.0) sprockets (3.7.2) concurrent-ruby (~> 1.0) diff --git a/package.json b/package.json index 1a65c68a7..7383b67a1 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "coveralls": "3.0.3", "enzyme": "3.10.0", "enzyme-adapter-react-16": "1.14.0", - "farmbot": "git+https://github.com/RickCarlino/farmbot-js.git", + "farmbot": "github:rickcarlino/farmbot-js#ac0b7f1", "farmbot-toastr": "1.0.3", "i18next": "17.0.1", "jest": "24.8.0", diff --git a/spec/controllers/api/password_resets/password_resets_spec.rb b/spec/controllers/api/password_resets/password_resets_spec.rb index ab674ee3c..5730cf819 100644 --- a/spec/controllers/api/password_resets/password_resets_spec.rb +++ b/spec/controllers/api/password_resets/password_resets_spec.rb @@ -51,7 +51,7 @@ describe Api::PasswordResetsController do it "handles token expiration" do token = PasswordResetToken - .issue_to(user, { exp: Time.now.yesterday }) + .issue_to(user, { exp: Time.now.yesterday.to_i }) .encoded params = { password: "xpassword123",