Update Ruby version, tests, patch svg_icon XSS vector

openfarmcc · May 20, 2019 · 523c4c2 · 523c4c2
1 parent 4ee7d2f
commit 523c4c2
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 10 deletions.
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.6.1
+2.6.3
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ language: ruby
 # If you don't specify a version, Travis CI will use MRI 1.9.3 as the default.
 # http://docs.travis-ci.com/user/languages/ruby/
 rvm:
-  - 2.6.1
+  - 2.6.3
 services:
   - mongodb
   - elasticsearch

diff --git a/Dockerfile b/Dockerfile
@@ -2,7 +2,7 @@
 # Image name: openfarm-webapp
 #
 
-FROM       ruby:2.6.1
+FROM       ruby:2.6.3
 MAINTAINER https://github.com/FarmBot/OpenFarm
 
 ENV     PHANTOM_JS_VERSION 1.9.8

diff --git a/Gemfile b/Gemfile
@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-ruby "2.6.1"
+ruby "2.6.3"
 
 gem "rails"
 gem "bundler"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -208,7 +208,6 @@ GEM
       moneta
       multi_json (>= 1.9.2)
     high_voltage (3.1.0)
-    http-2 (0.10.1)
     httparty (0.16.4)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
@@ -588,7 +587,7 @@ DEPENDENCIES
   webmock
 
 RUBY VERSION
-   ruby 2.6.1p33
+   ruby 2.6.3p62
 
 BUNDLED WITH
    1.17.2
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
@@ -18,14 +18,14 @@ echo "--- INSTALLING RVM ---"
 
 gpg --keyserver hkp://pool.sks-keyservers.net:80 --recv-keys D39DC0E3
 
-curl -sSL https://get.rvm.io | bash -s stable --quiet-curl --ruby=2.6.1
+curl -sSL https://get.rvm.io | bash -s stable --quiet-curl --ruby=2.6.3
 
 echo "--- INSTALLING RUBY 2.6.1 ---"
 
 source /home/vagrant/.rvm/scripts/rvm
 
 rvm reload
-rvm --default use 2.6.1
+rvm --default use 2.6.3
 
 echo "--- INSTALLING ELASTICSEARCH ---"
 

diff --git a/spec/models/guide_spec.rb b/spec/models/guide_spec.rb
@@ -70,8 +70,8 @@
 
   it "sets the popularity score" do
     Guide.destroy_all
-    FactoryBot.create(:guide)
-    FactoryBot.create(:guide)
+    FactoryBot.create(:guide, impressions_field: 10)
+    FactoryBot.create(:guide, impressions_field: 12)
     guide = FactoryBot.create(:guide)
     expect(guide.popularity_score).not_to eq(0)
   end