Merge branch 'release/1.15.3' into deps/bundle-local-gems

.config/.cypress.js

@@ -4,6 +4,9 @@ module.exports = {
     viewportHeight: 1000,
     viewportWidth: 1400,
 
+    // https://docs.cypress.io/app/references/experiments#End-to-End-Testing
+    experimentalRunAllSpecs: true,
+
     // https://docs.cypress.io/api/plugins/browser-launch-api#Changing-browser-preferences
     setupNodeEvents(on, _config) {
       on("before:browser:launch", (browser, launchOptions) => {

Gemfile.lock

@@ -222,8 +222,8 @@ GEM
       rails (>= 4.2.0)
       responders
     execjs (2.10.0)
-    factory_bot (6.5.0)
-      activesupport (>= 5.0.0)
+    factory_bot (6.5.1)
+      activesupport (>= 6.1.0)
     factory_bot_rails (6.4.4)
       factory_bot (~> 6.5)
       railties (>= 5.0.0)
@@ -274,7 +274,7 @@ GEM
     http-accept (1.7.0)
     http-cookie (1.0.8)
       domain_name (~> 0.5)
-    i18n (1.14.6)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
     image_processing (1.13.0)
       mini_magick (>= 4.9.5, < 5)
@@ -283,7 +283,8 @@ GEM
       activesupport (>= 3.0)
       nokogiri (>= 1.6)
     io-console (0.8.0)
-    irb (1.14.3)
+    irb (1.15.1)
+      pp (>= 0.6.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jbuilder (2.13.0)
@@ -324,10 +325,11 @@ GEM
       kramdown (~> 2.0)
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    language_server-protocol (3.17.0.3)
-    launchy (3.0.1)
+    language_server-protocol (3.17.0.4)
+    launchy (3.1.0)
       addressable (~> 2.8)
       childprocess (~> 5.0)
+      logger (~> 1.6)
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
@@ -348,7 +350,7 @@ GEM
     mini_magick (4.13.2)
     mini_mime (1.1.5)
     minitest (5.25.4)
-    mobility (1.3.1)
+    mobility (1.3.2)
       i18n (>= 0.6.10, < 2)
       request_store (~> 1.0)
     msgpack (1.7.5)
@@ -367,7 +369,7 @@ GEM
       net-protocol
     netrc (0.11.0)
     nio4r (2.7.4)
-    nokogiri (1.18.1-x86_64-linux-gnu)
+    nokogiri (1.18.2-x86_64-linux-gnu)
       racc (~> 1.4)
     onebox (2.2.19)
       addressable (~> 2.8.0)
@@ -383,7 +385,7 @@ GEM
     parser (3.3.7.0)
       ast (~> 2.4.1)
       racc
-    pdf-reader (2.13.0)
+    pdf-reader (2.14.0)
       Ascii85 (>= 1.0, < 3.0, != 2.0.0)
       afm (~> 0.2.1)
       hashery (~> 2.0)
@@ -392,6 +394,8 @@ GEM
     pg (1.5.9)
     pgreset (0.4)
     popper_js (2.11.8)
+    pp (0.6.2)
+      prettyprint
     pr_geohash (1.0.0)
     premailer (1.27.0)
       addressable
@@ -401,6 +405,7 @@ GEM
       actionmailer (>= 3)
       net-smtp
       premailer (~> 1.7, >= 1.7.9)
+    prettyprint (0.2.0)
     progress_bar (1.3.4)
       highline (>= 1.6)
       options (~> 2.3.0)
@@ -410,7 +415,7 @@ GEM
       date
       stringio
     public_suffix (6.0.1)
-    puma (6.5.0)
+    puma (6.6.0)
       nio4r (~> 2.0)
     pundit (2.4.0)
       activesupport (>= 3.0.0)
@@ -519,22 +524,22 @@ GEM
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
     rspec-support (3.13.2)
-    rubocop (1.70.0)
+    rubocop (1.71.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.36.2, < 2.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.37.0)
+    rubocop-ast (1.38.0)
       parser (>= 3.3.1.0)
     rubocop-performance (1.23.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rails (2.29.0)
+    rubocop-rails (2.29.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.52.0, < 2.0)
@@ -570,7 +575,8 @@ GEM
     shrine (3.6.0)
       content_disposition (~> 1.0)
       down (~> 5.1)
-    sidekiq (7.3.7)
+    sidekiq (7.3.8)
+      base64
       connection_pool (>= 2.3.0)
       logger
       rack (>= 2.2.4)
@@ -618,7 +624,7 @@ GEM
     sync (0.5.0)
     term-ansicolor (1.11.2)
       tins (~> 1.0)
-    terser (1.2.4)
+    terser (1.2.5)
       execjs (>= 0.3.0, < 3)
     thor (1.3.2)
     tilt (2.6.0)

app/abilities/lecture_ability.rb

@@ -5,7 +5,7 @@ def initialize(user)
     clear_aliased_actions
 
     can :new, Lecture do
-      user.course_editor?
+      user.course_editor? || user.admin?
     end
 
     can :create, Lecture do |lecture|

app/helpers/lectures_helper.rb

@@ -149,7 +149,6 @@ def teacher_select(form, is_new_lecture, lecture = nil)
 
       # TODO: Rubocop bug when trying to break the last object on a new line
       select = form.select(:teacher_id, preselection, {}, { class: "selectize",
-                                                            multiple: true,
                                                             data: {
                                                               ajax: true,
                                                               filled: false,

app/views/administration/index/_my_lectures.html.erb

@@ -11,6 +11,7 @@
                       class: 'fas fa-plus-circle text-light admin-index-button',
                       id: 'new-lecture-button',
                       data: { remote: true, toggle: 'tooltip' },
+                      "data-cy": 'new-lecture-button-admin-index',
                       title: t('admin.main.create_lecture') %>
         <% end %>
       </div>

app/views/lectures/_new.html.erb

@@ -16,7 +16,7 @@
     <% term_independent = (from != 'course' && first_course_independent?) ||
                             (from == 'course' && lecture.course.term_independent) %>
     <div class="row">
-      <div class="col-8">
+      <div class="col-8" data-cy="new-lecture-course-select-div">
         <%= f.label :course_id, t('basics.course'),
                     class: "form-label" %>
         <%= helpdesk(t('admin.lecture.info.course'), false) %>
@@ -70,7 +70,8 @@
     <div class="row">
       <div class="col-12 text-center">
         <%= f.submit t('buttons.save'),
-            class: 'btn btn-primary' %>
+              class: 'btn btn-primary',
+              "data-cy": 'new-lecture-submit' %>
         <button type="button"
                 id="cancel-new-lecture"
                 class="btn btn-secondary">

db/interactions_migrate/20191209143820_create_interactions.rb

@@ -1,9 +1,7 @@
-# rubocop:disable Rails/
 class CreateInteractions < ActiveRecord::Migration[6.0]
   def change
     create_table :interactions do |t|
       t.text :session_id
     end
   end
 end
-# rubocop:enable Rails/

db/interactions_migrate/20191209165752_add_details_to_interaction.rb

@@ -1,9 +1,7 @@
-# rubocop:disable Rails/
 class AddDetailsToInteraction < ActiveRecord::Migration[6.0]
   def change
     add_column :interactions, :controller_name, :text
     add_column :interactions, :action_name, :text
     add_column :interactions, :referrer_url, :text
   end
 end
-# rubocop:enable Rails/

db/interactions_migrate/20191211155453_remove_details_from_interactions.rb

@@ -1,8 +1,6 @@
-# rubocop:disable Rails/
 class RemoveDetailsFromInteractions < ActiveRecord::Migration[6.0]
   def change
     remove_column :interactions, :controller_name, :text
     remove_column :interactions, :action_name, :text
   end
 end
-# rubocop:enable Rails/

db/interactions_migrate/20191218131526_create_probes.rb

@@ -1,4 +1,3 @@
-# rubocop:disable Rails/
 class CreateProbes < ActiveRecord::Migration[6.0]
   def change
     create_table :probes do |t|
@@ -11,4 +10,3 @@ def change
     end
   end
 end
-# rubocop:enable Rails/

db/migrate/20170914162323_delete_asset_tag_join.rb

@@ -1,7 +1,5 @@
-# rubocop:disable Rails/
 class DeleteAssetTagJoin < ActiveRecord::Migration[5.1]
   def change
     drop_table :asset_tag_joins
   end
 end
-# rubocop:enable Rails/

db/migrate/20170919123229_add_admin_to_users.rb

@@ -1,7 +1,5 @@
-# rubocop:disable Rails/
 class AddAdminToUsers < ActiveRecord::Migration[5.1]
   def change
     add_column :users, :admin, :boolean
   end
 end
-# rubocop:enable Rails/

db/migrate/20171001204632_drop_asset.rb

@@ -1,9 +1,7 @@
-# rubocop:disable Rails/
 class DropAsset < ActiveRecord::Migration[5.1]
   def change
     drop_table :assets
     drop_table :asset_medium_joins
     drop_table :connections
   end
 end
-# rubocop:enable Rails/

db/migrate/20171009142032_add_modules_to_lecture.rb

@@ -1,4 +1,3 @@
-# rubocop:disable Rails/
 class AddModulesToLecture < ActiveRecord::Migration[5.1]
   def change
     add_column :lectures, :kaviar, :boolean
@@ -8,4 +7,3 @@ def change
     add_column :lectures, :erdbeere, :boolean
   end
 end
-# rubocop:enable Rails/

db/migrate/20171011171726_remove_confirmablefrom_devise.rb

@@ -1,7 +1,5 @@
-# rubocop:disable Rails/
 class RemoveConfirmablefromDevise < ActiveRecord::Migration[5.1]
   def change
     remove_columns :users, :confirmation_token, :confirmed_at, :confirmation_sent_at
   end
 end
-# rubocop:enable Rails/

db/migrate/20171016171419_add_kiwi_to_lecture.rb

@@ -1,7 +1,5 @@
-# rubocop:disable Rails/
 class AddKiwiToLecture < ActiveRecord::Migration[5.1]
   def change
     add_column :lectures, :kiwi, :boolean
   end
 end
-# rubocop:enable Rails/

db/migrate/20171021135749_add_extras_to_medium.rb

@@ -1,8 +1,6 @@
-# rubocop:disable Rails/
 class AddExtrasToMedium < ActiveRecord::Migration[5.1]
   def change
     add_column :media, :extras_link, :text
     add_column :media, :extras_description, :text
   end
 end
-# rubocop:enable Rails/

db/migrate/20180524065013_add_consents_to_user.rb

@@ -1,7 +1,5 @@
-# rubocop:disable Rails/
 class AddConsentsToUser < ActiveRecord::Migration[5.1]
   def change
     add_column :users, :consents, :boolean
   end
 end
-# rubocop:enable Rails/

db/migrate/20180524103749_remove_trackable_from_user.rb

@@ -1,4 +1,3 @@
-# rubocop:disable Rails/
 class RemoveTrackableFromUser < ActiveRecord::Migration[5.1]
   def change
     remove_column :users, :sign_in_count, :integer
@@ -8,4 +7,3 @@ def change
     remove_column :users, :last_sign_in_ip, :string
   end
 end
-# rubocop:enable Rails/

db/migrate/20180806092317_add_fields_to_course_user_join.rb

@@ -1,4 +1,3 @@
-# rubocop:disable Rails/
 class AddFieldsToCourseUserJoin < ActiveRecord::Migration[5.2]
   def change
     add_column :course_user_joins, :sesam, :boolean
@@ -8,4 +7,3 @@ def change
     add_column :course_user_joins, :reste, :boolean
   end
 end
-# rubocop:enable Rails/

db/migrate/20180806100940_add_news_to_course_user_join.rb

@@ -1,7 +1,5 @@
-# rubocop:disable Rails/
 class AddNewsToCourseUserJoin < ActiveRecord::Migration[5.2]
   def change
     add_column :course_user_joins, :news, :boolean
   end
 end
-# rubocop:enable Rails/

db/migrate/20180806124930_add_edited_profile_to_user.rb

@@ -1,7 +1,5 @@
-# rubocop:disable Rails/
 class AddEditedProfileToUser < ActiveRecord::Migration[5.2]
   def change
     add_column :users, :edited_profile, :boolean
   end
 end
-# rubocop:enable Rails/

db/migrate/20180808092444_remove_properties_from_lecture.rb

@@ -1,4 +1,3 @@
-# rubocop:disable Rails/
 class RemovePropertiesFromLecture < ActiveRecord::Migration[5.2]
   def change
     remove_column :lectures, :kaviar, :boolean
@@ -9,4 +8,3 @@ def change
     remove_column :lectures, :kiwi, :boolean
   end
 end
-# rubocop:enable Rails/

db/migrate/20180816125615_add_teacher_to_user.rb

@@ -1,7 +1,5 @@
-# rubocop:disable Rails/
 class AddTeacherToUser < ActiveRecord::Migration[5.2]
   def change
     add_column :users, :teacher, :boolean
   end
 end
-# rubocop:enable Rails/

db/migrate/20180819151835_create_editable_user_join_table.rb

@@ -1,4 +1,3 @@
-# rubocop:disable Rails/
 class CreateEditableUserJoinTable < ActiveRecord::Migration[5.2]
   def change
     create_table :editable_user_joins do |t|
@@ -12,4 +11,3 @@ def change
               name: "polymorphic_editable_idx"
   end
 end
-# rubocop:enable Rails/

db/migrate/20180820123437_add_editor_and_name_to_user.rb

@@ -1,8 +1,6 @@
-# rubocop:disable Rails/
 class AddEditorAndNameToUser < ActiveRecord::Migration[5.2]
   def change
     add_column :users, :editor, :boolean
     add_column :users, :name, :text
   end
 end
-# rubocop:enable Rails/

db/migrate/20180820152008_remove_teacher_and_teacher_id_from_user.rb

@@ -1,8 +1,6 @@
-# rubocop:disable Rails/
 class RemoveTeacherAndTeacherIdFromUser < ActiveRecord::Migration[5.2]
   def change
     remove_column :users, :teacher, :boolean
     remove_column :users, :teacher_id, :integer
   end
 end
-# rubocop:enable Rails/

db/migrate/20180821132727_remove_teacher_fragments.rb

@@ -1,8 +1,6 @@
-# rubocop:disable Rails/
 class RemoveTeacherFragments < ActiveRecord::Migration[5.2]
   def change
     remove_column :lectures, :teacher_id
     remove_reference :users, :teacher, foreign_key: true, index: true
   end
 end
-# rubocop:enable Rails/