diff --git a/Gemfile b/Gemfile index 7ab06201..b25cf8ad 100644 --- a/Gemfile +++ b/Gemfile @@ -10,7 +10,7 @@ if Gem::Version.new(Bundler::VERSION) < Gem::Version.new('1.8.4') end # as web framework -gem 'rails', '~> 5.2.4.3' +gem 'rails', '~> 5.2' # Use Puma as the app server gem 'puma', '~> 3.0' @@ -81,7 +81,7 @@ gem 'formtastic-bootstrap' # as the JavaScript library gem 'jquery-rails' -gem 'jquery-ui-rails', '~> 4.2.1' +gem 'jquery-ui-rails', '~> 6.0.1' # for languages validation gem 'iso-639' diff --git a/Gemfile.lock b/Gemfile.lock index b4a25ecd..79a3d3dd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -13,25 +13,25 @@ GEM remote: https://rails-assets.org/ specs: Ascii85 (1.0.3) - actioncable (5.2.4.3) - actionpack (= 5.2.4.3) + actioncable (5.2.4.4) + actionpack (= 5.2.4.4) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.4.3) - actionpack (= 5.2.4.3) - actionview (= 5.2.4.3) - activejob (= 5.2.4.3) + actionmailer (5.2.4.4) + actionpack (= 5.2.4.4) + actionview (= 5.2.4.4) + activejob (= 5.2.4.4) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.4.3) - actionview (= 5.2.4.3) - activesupport (= 5.2.4.3) + actionpack (5.2.4.4) + actionview (= 5.2.4.4) + activesupport (= 5.2.4.4) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.4.3) - activesupport (= 5.2.4.3) + actionview (5.2.4.4) + activesupport (= 5.2.4.4) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -41,20 +41,20 @@ GEM activemodel (>= 4.1, < 6.1) case_transform (>= 0.2) jsonapi-renderer (>= 0.1.1.beta1, < 0.3) - activejob (5.2.4.3) - activesupport (= 5.2.4.3) + activejob (5.2.4.4) + activesupport (= 5.2.4.4) globalid (>= 0.3.6) - activemodel (5.2.4.3) - activesupport (= 5.2.4.3) - activerecord (5.2.4.3) - activemodel (= 5.2.4.3) - activesupport (= 5.2.4.3) + activemodel (5.2.4.4) + activesupport (= 5.2.4.4) + activerecord (5.2.4.4) + activemodel (= 5.2.4.4) + activesupport (= 5.2.4.4) arel (>= 9.0) - activestorage (5.2.4.3) - actionpack (= 5.2.4.3) - activerecord (= 5.2.4.3) + activestorage (5.2.4.4) + actionpack (= 5.2.4.4) + activerecord (= 5.2.4.4) marcel (~> 0.3.1) - activesupport (5.2.4.3) + activesupport (5.2.4.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -111,7 +111,7 @@ GEM fastimage case_transform (0.2) activesupport - chartkick (3.3.0) + chartkick (3.4.0) childprocess (3.0.0) chronic (0.10.2) chunky_png (1.3.11) @@ -120,12 +120,12 @@ GEM aws_cf_signer rest-client cocoon (1.2.14) - codecov (0.1.14) + codecov (0.2.11) json simplecov - url coderay (1.1.1) - concurrent-ruby (1.1.6) + concurrent-ruby (1.1.7) + connection_pool (2.2.2) countable-rails (0.0.1) railties (>= 3.1) countries (3.0.0) @@ -156,7 +156,7 @@ GEM devise_ichain_authenticatable (0.3.2) devise (>= 2.2) diff-lcs (1.3) - docile (1.3.1) + docile (1.3.2) domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) dotenv (2.7.5) @@ -230,7 +230,7 @@ GEM htmlentities (4.3.4) http-cookie (1.0.3) domain_name (~> 0.5) - i18n (1.8.3) + i18n (1.8.5) concurrent-ruby (~> 1.0) i18n_data (0.8.0) inversion (1.1.1) @@ -243,9 +243,9 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - jquery-ui-rails (4.2.1) + jquery-ui-rails (6.0.1) railties (>= 3.2.16) - json (2.3.0) + json (2.3.1) json-schema (2.8.1) addressable (>= 2.4) jsonapi-renderer (0.2.2) @@ -265,7 +265,7 @@ GEM rb-inotify (~> 0.9, >= 0.9.7) ruby_dep (~> 1.2) loggability (0.14.0) - loofah (2.6.0) + loofah (2.7.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) lumberjack (1.0.12) @@ -284,7 +284,7 @@ GEM mini_magick (4.9.5) mini_mime (1.0.2) mini_portile2 (2.4.0) - minitest (5.14.1) + minitest (5.14.2) momentjs-rails (2.20.1) railties (>= 3.1) monetize (1.9.2) @@ -301,7 +301,7 @@ GEM multipart-post (2.1.1) nenv (0.3.0) netrc (0.11.0) - nio4r (2.5.2) + nio4r (2.5.4) nokogiri (1.10.10) mini_portile2 (~> 2.4.0) notiffany (0.1.1) @@ -379,18 +379,18 @@ GEM ruby-openid (>= 2.1.8) rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.2.4.3) - actioncable (= 5.2.4.3) - actionmailer (= 5.2.4.3) - actionpack (= 5.2.4.3) - actionview (= 5.2.4.3) - activejob (= 5.2.4.3) - activemodel (= 5.2.4.3) - activerecord (= 5.2.4.3) - activestorage (= 5.2.4.3) - activesupport (= 5.2.4.3) + rails (5.2.4.4) + actioncable (= 5.2.4.4) + actionmailer (= 5.2.4.4) + actionpack (= 5.2.4.4) + actionview (= 5.2.4.4) + activejob (= 5.2.4.4) + activemodel (= 5.2.4.4) + activerecord (= 5.2.4.4) + activestorage (= 5.2.4.4) + activesupport (= 5.2.4.4) bundler (>= 1.3.0) - railties (= 5.2.4.3) + railties (= 5.2.4.4) sprockets-rails (>= 2.0.0) rails-assets-bootstrap (3.3.6) rails-assets-jquery (>= 1.9.1, < 3) @@ -424,9 +424,9 @@ GEM rails-i18n (5.1.3) i18n (>= 0.7, < 2) railties (>= 5.0, < 6) - railties (5.2.4.3) - actionpack (= 5.2.4.3) - activesupport (= 5.2.4.3) + railties (5.2.4.4) + actionpack (= 5.2.4.4) + activesupport (= 5.2.4.4) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) @@ -524,11 +524,10 @@ GEM shellany (0.0.1) shoulda-matchers (4.1.2) activesupport (>= 4.2.0) - simplecov (0.16.1) + simplecov (0.19.0) docile (~> 1.1) - json (>= 1.8, < 3) - simplecov-html (~> 0.10.0) - simplecov-html (0.10.2) + simplecov-html (~> 0.11) + simplecov-html (0.12.3) sixarm_ruby_unaccent (1.2.0) skylight (3.1.5) skylight-core (= 3.1.5) @@ -543,7 +542,7 @@ GEM sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.1) + sprockets-rails (3.2.2) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) @@ -575,7 +574,6 @@ GEM unicode_utils (1.4.0) unobtrusive_flash (3.3.1) railties - url (0.3.2) warden (1.2.8) rack (>= 2.0.6) web-console (3.7.0) @@ -648,7 +646,7 @@ DEPENDENCIES iso-639 jquery-datatables jquery-rails - jquery-ui-rails (~> 4.2.1) + jquery-ui-rails (~> 6.0.1) json-schema leaflet-rails letter_opener @@ -670,7 +668,7 @@ DEPENDENCIES prawn-qrcode prawn-rails puma (~> 3.0) - rails (~> 5.2.4.3) + rails (~> 5.2) rails-assets-bootstrap-markdown! rails-assets-bootstrap-select! rails-assets-date.format! diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index cbd83bf4..ca8cf3da 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -13,8 +13,8 @@ //= require jquery //= require jquery_ujs //= require jquery.mobile.custom.min -//= require jquery.ui.draggable -//= require jquery.ui.droppable +//= require jquery-ui/widgets/draggable +//= require jquery-ui/widgets/droppable //= require waypoints/jquery.waypoints //= require datatables/jquery.dataTables diff --git a/app/controllers/admin/booths_controller.rb b/app/controllers/admin/booths_controller.rb index b33ec103..dd4e5844 100644 --- a/app/controllers/admin/booths_controller.rb +++ b/app/controllers/admin/booths_controller.rb @@ -10,7 +10,7 @@ module Admin @booth_export_option = params[:booth_export_option] respond_to do |format| format.html - # Explicity call #to_json to avoid the use of EventSerializer + # Explicitly call #to_json to avoid the use of EventSerializer format.json { render json: Booth.where(state: :confirmed, program: @program).to_json } format.xlsx do response.headers['Content-Disposition'] = "attachment; filename=\"#{@file_name}.xlsx\"" diff --git a/app/controllers/admin/events_controller.rb b/app/controllers/admin/events_controller.rb index 41feb8b1..b24882f3 100644 --- a/app/controllers/admin/events_controller.rb +++ b/app/controllers/admin/events_controller.rb @@ -24,7 +24,7 @@ module Admin respond_to do |format| format.html - # Explicity call #to_json to avoid the use of EventSerializer + # Explicitly call #to_json to avoid the use of EventSerializer format.json { render json: Event.where(state: :confirmed, program: @program).to_json } format.xlsx do response.headers['Content-Disposition'] = "attachment; filename=\"#{@file_name}.xlsx\"" diff --git a/app/controllers/admin/tracks_controller.rb b/app/controllers/admin/tracks_controller.rb index a4f4c69e..511a4fa9 100644 --- a/app/controllers/admin/tracks_controller.rb +++ b/app/controllers/admin/tracks_controller.rb @@ -15,7 +15,7 @@ module Admin respond_to do |format| format.html - # Explicity call #to_json to avoid the use of EventSerializer + # Explicitly call #to_json to avoid the use of EventSerializer format.json { render json: Track.where(state: :confirmed, program: @program).to_json } format.xlsx do response.headers['Content-Disposition'] = "attachment; filename=\"#{@file_name}.xlsx\"" diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 31529b62..7b868e83 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -53,7 +53,7 @@ class ApplicationController < ActionController::Base Rails.logger.debug('IChain Record was not Unique!') sign_out(current_user) redirect_to root_path, - error: 'Your E-Mail adress is already registered at OSEM. Please contact the admin if you want to attach your openSUSE Account to OSEM!' + error: 'Your E-Mail address is already registered at OSEM. Please contact the admin if you want to attach your openSUSE Account to OSEM!' end rescue_from UserDisabled do diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 3728c695..6984f304 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -69,7 +69,7 @@ module ApplicationHelper Comment.accessible_by(current_ability).find_since_last_login(user) end - # Recieves a PaperTrail::Version object + # Receives a PaperTrail::Version object # Outputs the list of attributes that were changed in the version (ignoring changes from one blank value to another) # Eg: If version.changeset = '{"title"=>[nil, "Premium"], "description"=>[nil, "Premium = Super cool"], "conference_id"=>[nil, 3]}' # Output will be 'title, description and conference' diff --git a/lib/tasks/events_registrations.rake b/lib/tasks/events_registrations.rake index a8f83360..171f4b25 100644 --- a/lib/tasks/events_registrations.rake +++ b/lib/tasks/events_registrations.rake @@ -1,7 +1,7 @@ # frozen_string_literal: true namespace :events_registrations do - desc "Deletes dupicate entries" + desc "Deletes duplicate entries" task deduplicate: :environment do if ActiveRecord::Migrator.get_all_versions.include? 20160403214841 duplicates = EventsRegistration.all.map { |er| er.id if er.valid? == false}.compact diff --git a/spec/features/versions_spec.rb b/spec/features/versions_spec.rb index 2988cc1c..eda602ac 100644 --- a/spec/features/versions_spec.rb +++ b/spec/features/versions_spec.rb @@ -373,7 +373,7 @@ feature 'Version' do EventsRegistration.create(registration: registration, event: event) EventsRegistration.first.update_attributes(attended: true) EventsRegistration.last.destroy - # Here registration is deleted to ensure the event registration related change still displays the asociated user's name + # Here registration is deleted to ensure the event registration related change still displays the associated user's name registration.destroy visit admin_revision_history_path diff --git a/spec/models/conference_spec.rb b/spec/models/conference_spec.rb index 81e7d406..64cc1aea 100755 --- a/spec/models/conference_spec.rb +++ b/spec/models/conference_spec.rb @@ -165,7 +165,7 @@ describe Conference do end describe '#get_submissions_data' do - it 'returns emtpy hash if there is no cfp or events' do + it 'returns empty hash if there is no cfp or events' do expect(subject.get_submissions_data).to eq [] end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index b809992f..cc014774 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -73,9 +73,11 @@ RSpec.configure do |config| end Capybara.register_driver :chrome_headless do |app| - options = Selenium::WebDriver::Chrome::Options.new( - args: %w(headless disable-gpu window-size=1920x1080 no-sandbox) - ) + options = ::Selenium::WebDriver::Chrome::Options.new + options.args << '--window-size=1920x1080' + options.args << '--headless' + options.args << '--no-sandbox' + options.args << '--disable-gpu' Capybara::Selenium::Driver.new(app, browser: :chrome, options: options) end