Upgrade ruby 3.0.6 (#19651)

Co-authored-by: Josh Klar <jklar@forem.com>
Co-authored-by: Mac Siri <krairit.siri@gmail.com>
This commit is contained in:
Helio Cola 2023-07-06 16:42:20 -04:00 committed by GitHub
parent 41de245b8e
commit c7bb3be603
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 23 additions and 16 deletions

View file

@ -19,6 +19,7 @@ env:
DATABASE_NAME_TEST: Forem_test
KNAPSACK_PRO_FIXED_QUEUE_SPLIT: true
POSTGRES_PASSWORD: postgres
KNAPSACK_PRO_LOG_LEVEL: info
jobs:
bundle_install:

View file

@ -1,7 +1,7 @@
FROM gitpod/workspace-postgres
# Install Ruby
ENV RUBY_VERSION=3.0.2
ENV RUBY_VERSION=3.0.6
# Install the GitHub CLI
RUN brew install gh

View file

@ -1 +1 @@
3.0.2
3.0.6

View file

@ -1,4 +1,4 @@
FROM ghcr.io/forem/ruby:3.0.2@sha256:04c945460e5999c0483b119074597dba62b863f5f5ea3c98bff4169e0d2f990b as base
FROM ghcr.io/forem/ruby:3.0.6@sha256:287260a9c729fcd4f7952c551f8320cfe484db9d1e3ac77986b175b959aba715 as base
FROM base as builder

View file

@ -173,3 +173,5 @@ group :test do
gem "with_model", "~> 2.1.6" # Dynamically build a model within an RSpec context
gem "zonebie", "~> 0.6.1" # Runs your tests in a random timezone
end
gem "cgi", "~> 0.3.6" # Support for the Common Gateway Interface protocol.

View file

@ -156,6 +156,7 @@ GEM
activesupport (>= 3.2.0)
carrierwave
fastimage
cgi (0.3.6)
chartkick (4.2.1)
cloudinary (1.26.0)
aws_cf_signer
@ -979,6 +980,7 @@ DEPENDENCIES
capybara (~> 3.37.1)
carrierwave (~> 2.2)
carrierwave-bombshelter (~> 0.2)
cgi (~> 0.3.6)
cloudinary (~> 1.23)
counter_culture (~> 3.2)
cuprite (~> 0.13)
@ -1118,7 +1120,7 @@ DEPENDENCIES
zonebie (~> 0.6.1)
RUBY VERSION
ruby 3.0.2p107
ruby 3.0.6p216
BUNDLED WITH
2.2.22
2.2.33

View file

@ -4,7 +4,7 @@ if [ "$KNAPSACK_PRO_TEST_SUITE_TOKEN_RSPEC" = "" ]; then
KNAPSACK_PRO_TEST_SUITE_TOKEN_RSPEC=disabled-for-fork \
KNAPSACK_PRO_MAX_REQUEST_RETRIES=0 \
KNAPSACK_PRO_CI_NODE_RETRY_COUNT=0 \
bundle exec rake "knapsack_pro:rspec[--format RspecJunitFormatter --out tmp/rspec.xml]"
bundle exec rake "knapsack_pro:rspec[--force-color --format documentation --format RspecJunitFormatter --out tmp/rspec.xml]"
else
bundle exec rake "knapsack_pro:queue:rspec[--format RspecJunitFormatter --out tmp/rspec.xml]"
bundle exec rake "knapsack_pro:queue:rspec[--force-color --format documentation --format RspecJunitFormatter --out tmp/rspec.xml]"
fi

View file

@ -7,12 +7,12 @@ RSpec.describe TwitchTag, type: :liquid_tag do
def assert_parses_clip(slug, token)
liquid = Liquid::Template.parse("{% twitch #{token} %}").render
expect(liquid).to include "https://clips.twitch.tv/embed?clip=#{slug}&amp;parent=localhost&amp;autoplay=false"
expect(liquid).to include "https://clips.twitch.tv/embed?clip=#{slug}&amp;parent=forem.test&amp;autoplay=false"
end
def assert_parses_video(id, token)
liquid = Liquid::Template.parse("{% twitch #{token} %}").render
expect(liquid).to include "https://player.twitch.tv/?video=#{id}&amp;parent=localhost&amp;autoplay=false"
expect(liquid).to include "https://player.twitch.tv/?video=#{id}&amp;parent=forem.test&amp;autoplay=false"
end
context "when twitch clip slug passed in" do

View file

@ -22,7 +22,7 @@ RSpec.describe UnifiedEmbed::Tag, type: :liquid_tag do
headers: {
"Accept" => "*/*",
"Accept-Encoding" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3",
"User-Agent" => "DEV(local) (http://localhost:3000)"
"User-Agent" => "DEV(local) (http://forem.test)"
},
)
.to_return(

View file

@ -1,4 +1,6 @@
ENV["RAILS_ENV"] = "test"
# Temporary workaround for Ruby 3.0.6 / CGI udpate
ENV["APP_DOMAIN"] = "forem.test"
require "knapsack_pro"
require "simplecov"
require "simplecov_json_formatter"

View file

@ -280,12 +280,12 @@ RSpec.describe "Articles" do
it "sets canonical url with base" do
get "/new"
expect(response.body).to include('<link rel="canonical" href="http://localhost:3000/new" />')
expect(response.body).to include('<link rel="canonical" href="http://forem.test/new" />')
end
it "sets canonical url with prefill" do
get "/new?prefill=dsdweewewew"
expect(response.body).to include('<link rel="canonical" href="http://localhost:3000/new" />')
expect(response.body).to include('<link rel="canonical" href="http://forem.test/new" />')
end
end

View file

@ -260,7 +260,7 @@ RSpec.describe "Stories::TaggedArticlesIndex" do
end
def renders_canonical_url(tag)
expect(response.body).to include("<link rel=\"canonical\" href=\"http://localhost:3000/t/#{tag.name}\" />")
expect(response.body).to include("<link rel=\"canonical\" href=\"http://forem.test/t/#{tag.name}\" />")
end
it "renders proper page 2", :aggregate_failures do
@ -276,7 +276,7 @@ RSpec.describe "Stories::TaggedArticlesIndex" do
end
def renders_page_2_canonical_url(tag)
expected_tag = "<link rel=\"canonical\" href=\"http://localhost:3000/t/#{tag.name}/page/2\" />"
expected_tag = "<link rel=\"canonical\" href=\"http://forem.test/t/#{tag.name}/page/2\" />"
expect(response.body).to include(expected_tag)
end
end

View file

@ -278,7 +278,7 @@ RSpec.describe MarkdownProcessor::Parser, type: :service do
end
it "strips the styles as expected" do
linked_user = %(<a class="mentioned-user" href="http://localhost:3000/user1">@user1</a>)
linked_user = %(<a class="mentioned-user" href="http://forem.test/user1">@user1</a>)
expected_result = <<~HTML.strip
<p>x{animation:s}#{linked_user} s{}&lt;br&gt;
&lt;style&gt;{transition:color 1s}:hover{color:red}&lt;/p&gt;

View file

@ -1,4 +1,4 @@
FROM ghcr.io/forem/ruby:3.0.2@sha256:04c945460e5999c0483b119074597dba62b863f5f5ea3c98bff4169e0d2f990b as base
FROM ghcr.io/forem/ruby:3.0.6@sha256:287260a9c729fcd4f7952c551f8320cfe484db9d1e3ac77986b175b959aba715 as base
FROM base as builder

BIN
vendor/cache/cgi-0.3.6.gem vendored Normal file

Binary file not shown.