summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitlab-ci.yml11
-rw-r--r--.rubocop.yml1
-rw-r--r--.ruby-version2
-rw-r--r--spec/vcr_cassettes/custom-action-ok-not-json.yml2
4 files changed, 14 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 72b8864..b96f50d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,6 +33,17 @@ rubocop:
except:
- tags
+#ruby 2.6
+rspec:ruby2.6:
+ image: ruby:2.6
+ variables:
+ INSTALL_BUNDLER_VERSION: ~> 1.17.3
+ <<: *rspec_definition
+ tags:
+ - ruby
+ except:
+ - tags
+
#ruby 2.2
rspec:ruby2.2:
image: ruby:2.2
diff --git a/.rubocop.yml b/.rubocop.yml
index 66b7951..0c080ae 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,5 +1,6 @@
# Exclude some of GitLab files
AllCops:
+ TargetRubyVersion: 2.3
Exclude:
- 'spec/**/*'
- 'vendor/**/*'
diff --git a/.ruby-version b/.ruby-version
index 00355e2..ec1cf33 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.3.7
+2.6.3
diff --git a/spec/vcr_cassettes/custom-action-ok-not-json.yml b/spec/vcr_cassettes/custom-action-ok-not-json.yml
index 3bfb390..405292d 100644
--- a/spec/vcr_cassettes/custom-action-ok-not-json.yml
+++ b/spec/vcr_cassettes/custom-action-ok-not-json.yml
@@ -46,6 +46,6 @@ http_interactions:
- '1.436040'
body:
encoding: UTF-8
- string: '""'
+ string: '{'
http_version:
recorded_at: Fri, 20 Jul 2018 06:18:58 GMT