fix: tests and dependencies

openedx · Nov 3, 2022 · 0fab65e · 0fab65e
1 parent d90851d
commit 0fab65e
Show file tree

Hide file tree

Showing 6 changed files with 76 additions and 98 deletions.
diff --git a/Gemfile b/Gemfile
@@ -11,15 +11,15 @@ gem 'bundler'
 
 gem 'rake'
 
-gem 'sinatra', '< 2.0'
+gem 'sinatra'
 gem 'sinatra-param', '~> 1.4'
 
 gem 'yajl-ruby', '~> 1.3.1'
 
 gem 'activemodel'
 gem 'protected_attributes_continued'
 
-gem 'mongoid', '~>7.0.0'
+gem 'mongoid'
 gem 'bson'
 gem 'bson_ext'
 
@@ -53,7 +53,7 @@ group :test do
   gem 'guard'
   gem 'guard-unicorn'
   gem 'rack-test', :require => 'rack/test'
-  gem 'rspec', '~> 3.6.0'
+  gem 'rspec'
   gem 'rspec-its'
   gem 'rspec-collection_matchers'
   gem 'webmock'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -118,16 +118,19 @@ GEM
     minitest (5.15.0)
     mongo (2.18.1)
       bson (>= 4.14.1, < 5.0.0)
-    mongoid (7.0.13)
-      activemodel (>= 5.1, < 6.2)
-      mongo (>= 2.7.0, < 3.0.0)
+    mongoid (7.5.1)
+      activemodel (>= 5.1, < 7.1, != 7.0.0)
+      mongo (>= 2.10.5, < 3.0.0)
+      ruby2_keywords (~> 0.0.5)
     mongoid_cleaner (1.2.0)
       mongoid (>= 4.0)
     mongoid_magic_counter_cache (1.1.1)
       mongoid
       rake
     multi_json (1.15.0)
     multipart-post (2.2.3)
+    mustermann (2.0.2)
+      ruby2_keywords (~> 0.0.1)
     nenv (0.3.0)
     netrc (0.11.0)
     newrelic_rpm (8.12.0)
@@ -144,8 +147,8 @@ GEM
     pry-nav (1.0.0)
       pry (>= 0.9.10, < 0.15)
     public_suffix (4.0.7)
-    rack (1.6.13)
-    rack-protection (1.5.5)
+    rack (2.2.4)
+    rack-protection (2.2.2)
       rack
     rack-test (2.0.2)
       rack (>= 1.3)
@@ -164,24 +167,24 @@ GEM
     rexml (3.2.5)
     rs_voteable_mongo (1.3.0)
       mongoid (~> 7.0)
-    rspec (3.6.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
     rspec-collection_matchers (1.2.0)
       rspec-expectations (>= 2.99.0.beta1)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
+      rspec-support (~> 3.12.0)
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.6.0)
+    rspec-mocks (3.12.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
     ruby2_keywords (0.0.5)
     shellany (0.0.1)
     simplecov (0.21.2)
@@ -190,10 +193,11 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    sinatra (1.4.8)
-      rack (~> 1.5)
-      rack-protection (~> 1.4)
-      tilt (>= 1.3, < 3)
+    sinatra (2.2.2)
+      mustermann (~> 2.0)
+      rack (~> 2.2)
+      rack-protection (= 2.2.2)
+      tilt (~> 2.0)
     sinatra-param (1.6.0)
       sinatra (>= 1.3)
     thor (1.2.1)
@@ -238,7 +242,7 @@ DEPENDENCIES
   guard
   guard-unicorn
   i18n
-  mongoid (~> 7.0.0)
+  mongoid
   mongoid-tree!
   mongoid_cleaner (~> 1.2.0)
   mongoid_magic_counter_cache
@@ -254,10 +258,10 @@ DEPENDENCIES
   rdiscount
   rest-client
   rs_voteable_mongo (~> 1.3)
-  rspec (~> 3.6.0)
+  rspec
   rspec-collection_matchers
   rspec-its
-  sinatra (< 2.0)
+  sinatra
   sinatra-param (~> 1.4)
   timecop (~> 0.9.5)
   unicorn

diff --git a/Gemfile3 b/Gemfile3
@@ -9,14 +9,14 @@ gem 'pry-nav'
 
 gem 'bundler'
 
-gem 'rake', '~> 12.3.3'
+gem 'rake'
 
 gem 'sinatra'
 gem 'sinatra-param', '~> 1.4'
 
 gem 'yajl-ruby', '~> 1.3.1'
 
-gem 'activemodel', '~> 6.0.3.1'
+gem 'activemodel'
 gem 'protected_attributes_continued'
 
 gem 'mongoid'
@@ -45,18 +45,6 @@ gem 'dalli'
 
 gem 'rest-client'
 
-gem 'rubyzip', '~> 1.2.2'
-
-gem 'ffi', '~> 1.9.24'
-
-gem 'faye-websocket', '~> 0.11.0'
-
-gem 'addressable', '~> 2.8.0'
-
-gem 'activesupport', '~> 6.0.3.1'
-
-gem 'rack-protection', '~> 1.5.5'
-
 group :test do
   gem 'codecov', :require => false
   gem 'mongoid_cleaner', '~> 1.2.0'
@@ -65,7 +53,7 @@ group :test do
   gem 'guard'
   gem 'guard-unicorn'
   gem 'rack-test', :require => 'rack/test'
-  gem 'rspec', '~> 3.6.0'
+  gem 'rspec'
   gem 'rspec-its'
   gem 'rspec-collection_matchers'
   gem 'webmock'