Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .github/workflows/maze-runner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -142,9 +142,6 @@ jobs:
matrix:
ruby-version: ['2.7', '3.3']
rails-version: ['6', '7']
include:
- ruby-version: '2.5'
rails-version: '6'
exclude:
- ruby-version: '2.7'
rails-version: '6'
Expand Down
1 change: 0 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: '3.6'
services:

license_finder:
Expand Down
1 change: 0 additions & 1 deletion features/fixtures/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: '3.6'
services:
# dep for job systems
redis:
Expand Down
13 changes: 12 additions & 1 deletion features/fixtures/que/app/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,18 @@ gem "bugsnag", path: "/bugsnag"
que_version = ENV.fetch("QUE_VERSION")
gem "que", "~> #{que_version}"

gem "pg", RUBY_VERSION < "2.2.0" ? "0.21.0" : "> 0.21.0"
pg_version = if RUBY_VERSION < "2.2.0"
"0.21.0"
elsif RUBY_VERSION < "2.7.0"
# pg 1.6.0 on Linux needs Ruby 2.7
"1.5.0"
elsif RUBY_VERSION < "3.0.0"
# pg 1.6.1 on Linux needs Ruby 3
"1.6.0"
else
"> 1.6.0"
end
gem "pg", pg_version

# Install a compatible Minitest version on Ruby <2.3
gem 'minitest', '5.11.3' if RUBY_VERSION < '2.3.0'
2 changes: 1 addition & 1 deletion features/fixtures/rails6/app/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 6'
# Use sqlite3 as the database for Active Record
gem 'sqlite3', '~> 1.4.4'
gem "sqlite3", RUBY_VERSION >= '3.0' ? "~> 1.7" : "< 1.7"
# Use Puma as the app server
gem 'puma', '~> 3.11'
# Use SCSS for stylesheets
Expand Down
8 changes: 4 additions & 4 deletions features/fixtures/rails7/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
ARG RUBY_TEST_VERSION
FROM ruby:$RUBY_TEST_VERSION

RUN apt-get update
RUN apt-get update && apt-get install -y gnupg

RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor -o /usr/share/keyrings/yarn-archive-keyring.gpg
RUN echo "deb [signed-by=/usr/share/keyrings/yarn-archive-keyring.gpg] https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list

RUN apt-get install -y nodejs yarn
RUN apt-get update && apt-get install -y nodejs yarn

WORKDIR /bugsnag
COPY temp-bugsnag-lib ./
Expand Down
8 changes: 4 additions & 4 deletions features/fixtures/rails8/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
ARG RUBY_TEST_VERSION
FROM ruby:$RUBY_TEST_VERSION

RUN apt-get update
RUN apt-get update && apt-get install -y gnupg

RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor -o /usr/share/keyrings/yarn-archive-keyring.gpg
RUN echo "deb [signed-by=/usr/share/keyrings/yarn-archive-keyring.gpg] https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list

RUN apt-get install -y nodejs yarn
RUN apt-get update && apt-get install -y nodejs yarn

WORKDIR /bugsnag
COPY temp-bugsnag-lib ./
Expand Down
8 changes: 4 additions & 4 deletions features/fixtures/rails_integrations/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
ARG RUBY_TEST_VERSION
FROM ruby:$RUBY_TEST_VERSION

RUN apt-get update
RUN apt-get update && apt-get install -y gnupg

RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor -o /usr/share/keyrings/yarn-archive-keyring.gpg
RUN echo "deb [signed-by=/usr/share/keyrings/yarn-archive-keyring.gpg] https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list

RUN apt-get install -y nodejs yarn
RUN apt-get update && apt-get install -y nodejs yarn

WORKDIR /bugsnag
COPY temp-bugsnag-lib ./
Expand Down
6 changes: 4 additions & 2 deletions features/rails_features/request.feature
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ Scenario: Request data is collected automatically
And the event "metaData.request.clientIp" is not null
And the event "metaData.request.headers.Host" is not null
And the event "metaData.request.headers.User-Agent" is not null
And the event "metaData.request.headers.Version" is not null
# Skipped pending PLAT-15456
# And the event "metaData.request.headers.Version" is not null
And the event "metaData.request.httpMethod" equals "GET"
And the event "metaData.request.params.action" equals "error"
And the event "metaData.request.params.controller" equals "unhandled"
Expand All @@ -40,7 +41,8 @@ Scenario: Request data can be modified in callbacks
And the event "metaData.request.clientIp" is not null
And the event "metaData.request.headers.Host" is not null
And the event "metaData.request.headers.User-Agent" is not null
And the event "metaData.request.headers.Version" is not null
# Skipped pending PLAT-15456
# And the event "metaData.request.headers.Version" is not null
And the event "metaData.request.httpMethod" equals "GET"
And the event "metaData.request.params.action" equals "error"
And the event "metaData.request.params.controller" equals "unhandled"
Expand Down
Loading