Merge pull request #1601 from zendesk/grosser/24

SAMSON-322 use ruby 2.4

.ruby-version

@@ -1 +1 @@
-2.3.3
+2.4.1

.travis.yml

@@ -25,3 +25,5 @@ before_script:
   - mysql -u root -e 'set GLOBAL innodb_large_prefix = true'
   - mysql -u root -e 'set GLOBAL innodb_file_per_table = true'
   - mysql -u root -e 'set GLOBAL innodb_file_format = "barracuda"'
+  - mysql -u root -e 'GRANT ALL ON *.* TO 'travis'@'localhost';'
+

Gemfile.lock

@@ -583,7 +583,7 @@ DEPENDENCIES
   webmock
 
 RUBY VERSION
-   ruby 2.3.3p222
+   ruby 2.4.1p111
 
 BUNDLED WITH
    1.15.3

app/models/concerns/attr_encrypted_support.rb

@@ -2,7 +2,7 @@
 require 'attr_encrypted'
 
 module AttrEncryptedSupport
-  ENCRYPTION_KEY = Rails.application.secrets.secret_key_base
+  ENCRYPTION_KEY = Rails.application.secrets.secret_key_base[0...32]
   ENCRYPTION_KEY_SHA = Digest::SHA2.hexdigest(Rails.application.secrets.secret_key_base)
 
   def self.included(base)

app/models/user.rb

@@ -28,9 +28,12 @@ class User < ActiveRecord::Base
   before_soft_delete :destroy_user_project_roles
 
   scope :search, ->(query) {
-    return self if query.blank?
-    query = ActiveRecord::Base.send(:sanitize_sql_like, query)
-    where("name LIKE ? OR email LIKE ?", "%#{query}%", "%#{query}%")
+    if query.blank?
+      self
+    else
+      query = ActiveRecord::Base.send(:sanitize_sql_like, query)
+      where("name LIKE ? OR email LIKE ?", "%#{query}%", "%#{query}%")
+    end
   }
 
   def self.with_role(role_id, project_id)

plugins/flowdock/test/samson_flowdock/flowdock_service_test.rb

@@ -21,9 +21,7 @@
 
     it "shows nothing when flowdock fails to fetch users" do
       stub_request(:get, "https://api.flowdock.com/v1/users").to_timeout
-      Rails.logger.expects(:error).with(
-        'Error fetching flowdock users (token invalid / flowdock down). Net::OpenTimeout: execution expired'
-      )
+      Rails.logger.expects(:error).with(includes('Error fetching flowdock users'))
       service.users.must_equal([])
 
       # is cached

plugins/slack_webhooks/test/samson_slack_webhooks/slack_webhooks_service_test.rb

@@ -26,7 +26,7 @@
     it "returns empty users when there's an error" do
       stub_request(:post, "https://slack.com/api/users.list").
         to_return(body: {ok: false, error: "some error"}.to_json)
-      Rails.logger.expects(:error).with('Error fetching slack users: some error')
+      Rails.logger.expects(:error).with(includes('Error fetching slack users'))
       service.users.must_equal([])
 
       # is cached
@@ -35,9 +35,7 @@
 
     it "shows nothing when slack fails to fetch users" do
       stub_request(:post, "https://slack.com/api/users.list").to_timeout
-      Rails.logger.expects(:error).with(
-        'Error fetching slack users (token invalid / service down). Faraday::ConnectionFailed: execution expired'
-      )
+      Rails.logger.expects(:error).with(includes('Error fetching slack users'))
       service.users.must_equal([])
 
       # is cached

test/helpers/application_helper_test.rb

@@ -356,7 +356,7 @@
     end
 
     it "fails on unknown" do
-      assert_raises(ArgumentError) { link_to_resource(123) }.message.must_equal "Unsupported resource Fixnum"
+      assert_raises(ArgumentError) { link_to_resource(123) }.message.must_equal "Unsupported resource Integer"
     end
 
     # sanity check that we did not miss anything especially plugin models

test/models/docker_builder_service_test.rb

@@ -381,7 +381,8 @@ def stub_push(repo, tag, result, force: false)
         DockerBuilderService.class_variable_set(:@@docker_major_version, nil)
       end
 
-      it "adds login commands" do
+      it "uses email flag when docker is old" do
+        DockerBuilderService.expects(:read_docker_version).returns("1.12.0")
         called[1].must_equal "docker login --username fo\\+o --password ba\\+r --email [email protected] ba\\+z.com"
       end
 
@@ -391,9 +392,13 @@ def stub_push(repo, tag, result, force: false)
       end
 
       it "does not use email flag on newer docker versions" do
-        DockerBuilderService.expects(:docker_major_version).returns(17)
+        DockerBuilderService.expects(:read_docker_version).returns("17.0.0")
         called[1].must_equal "docker login --username fo\\+o --password ba\\+r ba\\+z.com"
       end
+
+      it "can do a real docker check" do
+        called # checking that it does not blow up ... result varies depending on if docker is installed
+      end
     end
 
     it "copies previous config files from ENV location" do