Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/bundler/nokogiri-1.16.3
Browse files Browse the repository at this point in the history
  • Loading branch information
@digitaltom
digitaltom committed Jun 4, 2024
2 parents 4a07e99 + 2e90430 commit 9f62fca
Show file tree
Hide file tree
Showing 5 changed files with 77 additions and 80 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/rubyonrails.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ jobs:
env:
RAILS_ENV: test
geekos_mongodb_server: "localhost"
CODECOV_TOKEN: secrets.CODECOV_TOKEN
steps:
- name: Checkout code
uses: actions/checkout@v2
Expand All @@ -42,8 +43,9 @@ jobs:
run: bundle exec rubocop --parallel

- name: Upload coverage to Codecov
uses: codecov/codecov-action@v2
uses: codecov/codecov-action@v4
with:
fail_ci_if_error: false
token: ${{ secrets.CODECOV_TOKEN }}
directory: ./coverage/
files: codecov-result.json
Expand Down
1 change: 0 additions & 1 deletion Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ group :development, :test do
end

group :test do
gem 'codecov'
gem 'database_cleaner-mongoid'
gem 'hashie'
gem 'json_matchers'
Expand Down
147 changes: 72 additions & 75 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,47 +13,47 @@ GIT
GEM
remote: https://rubygems.org/
specs:
actioncable (7.0.8)
actionpack (= 7.0.8)
activesupport (= 7.0.8)
actioncable (7.0.8.3)
actionpack (= 7.0.8.3)
activesupport (= 7.0.8.3)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (7.0.8)
actionpack (= 7.0.8)
activejob (= 7.0.8)
activerecord (= 7.0.8)
activestorage (= 7.0.8)
activesupport (= 7.0.8)
actionmailbox (7.0.8.3)
actionpack (= 7.0.8.3)
activejob (= 7.0.8.3)
activerecord (= 7.0.8.3)
activestorage (= 7.0.8.3)
activesupport (= 7.0.8.3)
mail (>= 2.7.1)
net-imap
net-pop
net-smtp
actionmailer (7.0.8)
actionpack (= 7.0.8)
actionview (= 7.0.8)
activejob (= 7.0.8)
activesupport (= 7.0.8)
actionmailer (7.0.8.3)
actionpack (= 7.0.8.3)
actionview (= 7.0.8.3)
activejob (= 7.0.8.3)
activesupport (= 7.0.8.3)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
rails-dom-testing (~> 2.0)
actionpack (7.0.8)
actionview (= 7.0.8)
activesupport (= 7.0.8)
actionpack (7.0.8.3)
actionview (= 7.0.8.3)
activesupport (= 7.0.8.3)
rack (~> 2.0, >= 2.2.4)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (7.0.8)
actionpack (= 7.0.8)
activerecord (= 7.0.8)
activestorage (= 7.0.8)
activesupport (= 7.0.8)
actiontext (7.0.8.3)
actionpack (= 7.0.8.3)
activerecord (= 7.0.8.3)
activestorage (= 7.0.8.3)
activesupport (= 7.0.8.3)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.0.8)
activesupport (= 7.0.8)
actionview (7.0.8.3)
activesupport (= 7.0.8.3)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
Expand All @@ -63,22 +63,22 @@ GEM
activemodel (>= 4.1)
case_transform (>= 0.2)
jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
activejob (7.0.8)
activesupport (= 7.0.8)
activejob (7.0.8.3)
activesupport (= 7.0.8.3)
globalid (>= 0.3.6)
activemodel (7.0.8)
activesupport (= 7.0.8)
activerecord (7.0.8)
activemodel (= 7.0.8)
activesupport (= 7.0.8)
activestorage (7.0.8)
actionpack (= 7.0.8)
activejob (= 7.0.8)
activerecord (= 7.0.8)
activesupport (= 7.0.8)
activemodel (7.0.8.3)
activesupport (= 7.0.8.3)
activerecord (7.0.8.3)
activemodel (= 7.0.8.3)
activesupport (= 7.0.8.3)
activestorage (7.0.8.3)
actionpack (= 7.0.8.3)
activejob (= 7.0.8.3)
activerecord (= 7.0.8.3)
activesupport (= 7.0.8.3)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
activesupport (7.0.8)
activesupport (7.0.8.3)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
Expand All @@ -98,17 +98,15 @@ GEM
cancancan (3.5.0)
case_transform (0.2)
activesupport
codecov (0.6.0)
simplecov (>= 0.15, < 0.22)
concurrent-ruby (1.2.2)
concurrent-ruby (1.3.1)
crack (0.4.5)
rexml
crass (1.0.6)
database_cleaner-core (2.0.1)
database_cleaner-mongoid (2.0.1)
database_cleaner-core (~> 2.0.0)
mongoid
date (3.3.3)
date (3.3.4)
diff-lcs (1.5.0)
docile (1.4.0)
domain_name (0.5.20190701)
Expand Down Expand Up @@ -144,7 +142,7 @@ GEM
http-cookie (1.0.5)
domain_name (~> 0.5)
httpclient (2.8.3)
i18n (1.14.1)
i18n (1.14.5)
concurrent-ruby (~> 1.0)
json (2.6.3)
json-jwt (1.15.3)
Expand All @@ -163,21 +161,21 @@ GEM
listen (3.8.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
loofah (2.21.4)
loofah (2.22.0)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
mail (2.8.1)
mini_mime (>= 0.1.1)
net-imap
net-pop
net-smtp
marcel (1.0.2)
method_source (1.0.0)
marcel (1.0.4)
method_source (1.1.0)
mime-types (3.4.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2022.0105)
mini_mime (1.1.5)
minitest (5.20.0)
minitest (5.23.1)
mongo (2.19.3)
bson (>= 4.14.1, < 5.0.0)
mongoid (8.1.4)
Expand All @@ -194,19 +192,19 @@ GEM
mongoid (>= 4.0, < 9)
msgpack (1.7.2)
multi_json (1.15.0)
net-imap (0.4.1)
net-imap (0.4.12)
date
net-protocol
net-ldap (0.18.0)
net-pop (0.1.2)
net-protocol
net-protocol (0.2.1)
net-protocol (0.2.2)
timeout
net-smtp (0.4.0)
net-smtp (0.5.0)
net-protocol
netrc (0.11.0)
nio4r (2.5.9)
nokogiri (1.16.3-x86_64-linux)
nio4r (2.7.3)
nokogiri (1.16.5-x86_64-linux)
racc (~> 1.4)
oauth (0.5.10)
oj (3.16.1)
Expand All @@ -230,10 +228,10 @@ GEM
ast (~> 2.4.1)
racc
public_suffix (5.0.3)
puma (6.4.0)
puma (6.4.2)
nio4r (~> 2.0)
racc (1.7.3)
rack (2.2.8)
racc (1.8.0)
rack (2.2.9)
rack-cache (1.14.0)
rack (>= 0.4)
rack-cors (2.0.1)
Expand All @@ -246,36 +244,36 @@ GEM
rack (>= 2.1.0)
rack-test (2.1.0)
rack (>= 1.3)
rails (7.0.8)
actioncable (= 7.0.8)
actionmailbox (= 7.0.8)
actionmailer (= 7.0.8)
actionpack (= 7.0.8)
actiontext (= 7.0.8)
actionview (= 7.0.8)
activejob (= 7.0.8)
activemodel (= 7.0.8)
activerecord (= 7.0.8)
activestorage (= 7.0.8)
activesupport (= 7.0.8)
rails (7.0.8.3)
actioncable (= 7.0.8.3)
actionmailbox (= 7.0.8.3)
actionmailer (= 7.0.8.3)
actionpack (= 7.0.8.3)
actiontext (= 7.0.8.3)
actionview (= 7.0.8.3)
activejob (= 7.0.8.3)
activemodel (= 7.0.8.3)
activerecord (= 7.0.8.3)
activestorage (= 7.0.8.3)
activesupport (= 7.0.8.3)
bundler (>= 1.15.0)
railties (= 7.0.8)
railties (= 7.0.8.3)
rails-dom-testing (2.2.0)
activesupport (>= 5.0.0)
minitest
nokogiri (>= 1.6)
rails-html-sanitizer (1.6.0)
loofah (~> 2.21)
nokogiri (~> 1.14)
railties (7.0.8)
actionpack (= 7.0.8)
activesupport (= 7.0.8)
railties (7.0.8.3)
actionpack (= 7.0.8.3)
activesupport (= 7.0.8.3)
method_source
rake (>= 12.2)
thor (~> 1.0)
zeitwerk (~> 2.5)
rainbow (3.1.1)
rake (13.0.6)
rake (13.2.1)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
Expand Down Expand Up @@ -373,8 +371,8 @@ GEM
activesupport (>= 3)
attr_required (>= 0.0.5)
httpclient (>= 2.4)
thor (1.2.2)
timeout (0.4.0)
thor (1.3.1)
timeout (0.4.1)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unf (0.1.4)
Expand All @@ -397,7 +395,7 @@ GEM
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
zeitwerk (2.6.12)
zeitwerk (2.6.15)

PLATFORMS
x86_64-linux
Expand All @@ -408,7 +406,6 @@ DEPENDENCIES
bootsnap
byebug
cancancan
codecov
database_cleaner-mongoid
dragonfly
factory_bot_rails
Expand Down
2 changes: 1 addition & 1 deletion app/serializers/user_summary_serializer.rb
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
class UserSummarySerializer < ActiveModel::Serializer
attributes :type, :email, :username, :title, :fullname, :phone, :gravatar, :picture_160,
:picture_25, :picture_50, :email, :teamlead_of
:picture_25, :picture_50, :email, :teamlead_of, :location, :room, :coordinates

def type
'user'
Expand Down
3 changes: 1 addition & 2 deletions spec/rails_helper.rb
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
require 'simplecov'
require 'codecov'
SimpleCov.minimum_coverage 100
SimpleCov.start 'rails' do
add_filter 'lib/ldap.rb'
Expand All @@ -10,7 +9,7 @@
add_filter 'app/controllers/api/rooms_controller.rb'
# has generated environment specific code
add_filter 'app/controllers/graphql_controller.rb'
formatter(ENV['CI'] ? SimpleCov::Formatter::Codecov : SimpleCov::Formatter::HTMLFormatter)
formatter(SimpleCov::Formatter::HTMLFormatter)
end

ENV['RAILS_ENV'] = 'test'
Expand Down

0 comments on commit 9f62fca

Please sign in to comment.