diff --git a/Gemfile.lock b/Gemfile.lock index 44f1bd3f9..e8cf0ab8f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,25 +7,25 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (5.2.2.1) - actionpack (= 5.2.2.1) + actioncable (5.2.3) + actionpack (= 5.2.3) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.2.1) - actionpack (= 5.2.2.1) - actionview (= 5.2.2.1) - activejob (= 5.2.2.1) + actionmailer (5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.2.1) - actionview (= 5.2.2.1) - activesupport (= 5.2.2.1) + actionpack (5.2.3) + actionview (= 5.2.3) + activesupport (= 5.2.3) rack (~> 2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.2.1) - activesupport (= 5.2.2.1) + actionview (5.2.3) + activesupport (= 5.2.3) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -35,20 +35,20 @@ GEM activemodel (>= 4.1, < 6) case_transform (>= 0.2) jsonapi-renderer (>= 0.1.1.beta1, < 0.3) - activejob (5.2.2.1) - activesupport (= 5.2.2.1) + activejob (5.2.3) + activesupport (= 5.2.3) globalid (>= 0.3.6) - activemodel (5.2.2.1) - activesupport (= 5.2.2.1) - activerecord (5.2.2.1) - activemodel (= 5.2.2.1) - activesupport (= 5.2.2.1) + activemodel (5.2.3) + activesupport (= 5.2.3) + activerecord (5.2.3) + activemodel (= 5.2.3) + activesupport (= 5.2.3) arel (>= 9.0) - activestorage (5.2.2.1) - actionpack (= 5.2.2.1) - activerecord (= 5.2.2.1) + activestorage (5.2.3) + actionpack (= 5.2.3) + activerecord (= 5.2.3) marcel (~> 0.3.1) - activesupport (5.2.2.1) + activesupport (5.2.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -83,7 +83,7 @@ GEM delayed_job_active_record (4.1.3) activerecord (>= 3.0, < 5.3) delayed_job (>= 3.0, < 5) - devise (4.6.1) + devise (4.6.2) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0, < 6.0) @@ -115,7 +115,7 @@ GEM excon (~> 0.58) formatador (~> 0.2) mime-types - fog-google (1.8.2) + fog-google (1.9.1) fog-core (<= 2.1.0) fog-json (~> 1.2) fog-xml (~> 0.1.0) @@ -185,7 +185,7 @@ GEM mutations (0.9.0) activesupport nio4r (2.3.1) - nokogiri (1.10.1) + nokogiri (1.10.2) mini_portile2 (~> 2.4.0) orm_adapter (0.5.0) os (1.0.0) @@ -215,21 +215,21 @@ GEM rack (2.0.6) rack-attack (5.4.2) rack (>= 1.0, < 3) - rack-cors (1.0.2) + rack-cors (1.0.3) rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.2.2.1) - actioncable (= 5.2.2.1) - actionmailer (= 5.2.2.1) - actionpack (= 5.2.2.1) - actionview (= 5.2.2.1) - activejob (= 5.2.2.1) - activemodel (= 5.2.2.1) - activerecord (= 5.2.2.1) - activestorage (= 5.2.2.1) - activesupport (= 5.2.2.1) + rails (5.2.3) + actioncable (= 5.2.3) + actionmailer (= 5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + activemodel (= 5.2.3) + activerecord (= 5.2.3) + activestorage (= 5.2.3) + activesupport (= 5.2.3) bundler (>= 1.3.0) - railties (= 5.2.2.1) + railties (= 5.2.3) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) @@ -246,9 +246,9 @@ GEM rails_stdout_logging rails_serve_static_assets (0.0.5) rails_stdout_logging (0.0.5) - railties (5.2.2.1) - actionpack (= 5.2.2.1) - activesupport (= 5.2.2.1) + railties (5.2.3) + actionpack (= 5.2.3) + activesupport (= 5.2.3) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) diff --git a/spec/controllers/api/images/images_spec.rb b/spec/controllers/api/images/images_spec.rb index f1443fa21..21c000169 100644 --- a/spec/controllers/api/images/images_spec.rb +++ b/spec/controllers/api/images/images_spec.rb @@ -66,8 +66,7 @@ describe Api::ImagesController do sign_in user before_count = Image.count post :create, - body: { attachment_url: "https://placeholdit.imgix.net/~text?txt"\ - "size=5&txt=1%C3%971&w=1&h=1&txtpad=1", + body: { attachment_url: FAKE_ATTACHMENT_URL, meta: { x: 1, z: 3 } }.to_json, params: {format: :json} expect(response.status).to eq(200) diff --git a/spec/models/image_spec.rb b/spec/models/image_spec.rb index 6fa6814a2..00d0712be 100644 --- a/spec/models/image_spec.rb +++ b/spec/models/image_spec.rb @@ -8,8 +8,7 @@ describe Image do expect(image.attachment_processed_at).to be_nil expect(image.attachment.exists?).to be_falsy - image.set_attachment_by_url("https://placeholdit.imgix.net/~text?txts"\ - "ize=5&txt=1%C3%971&w=1&h=1&txtpad=1") + image.set_attachment_by_url(FAKE_ATTACHMENT_URL) image.save! expect(image.attachment.exists?).to be_truthy diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 5c12778cf..eda4b291f 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -103,6 +103,10 @@ RSpec.configure do |config| end end +FAKE_ATTACHMENT_URL = "https://cdn.shopify.com/s/files/1/2040/0"\ + "289/files/FarmBot.io_Trimmed_Logo_Gray_o"\ + "n_Transparent_1_434x200.png?v=1525220371" + def run_jobs_now delay_jobs = Delayed::Worker.delay_jobs Delayed::Worker.delay_jobs = false