From f809f36c060d5b45717757e179cf63ecb79d4309 Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Sun, 24 Feb 2019 15:47:27 +0100 Subject: [PATCH] Upgraded to Rails 4 --- Gemfile | 92 +-- Gemfile.lock | 533 ++++++++++-------- app/models/attachment.rb | 2 +- app/models/calentry.rb | 2 +- app/models/comment.rb | 6 +- app/models/document.rb | 8 +- app/models/gallery.rb | 2 +- app/models/lva.rb | 2 +- app/models/meeting.rb | 15 +- app/models/meetingtyp.rb | 4 +- app/models/neuigkeit.rb | 6 +- app/models/nlink.rb | 2 +- app/models/rubrik.rb | 2 +- app/models/studium.rb | 4 +- app/models/thema.rb | 6 +- app/models/themengruppe.rb | 2 +- config/environments/development.rb | 2 + config/environments/production.rb | 3 +- config/environments/test.rb | 2 +- config/initializers/devise.rb | 2 +- config/initializers/locale.rb | 2 +- config/initializers/themes_for_rails.rb | 12 +- config/routes.rb | 81 +-- .../fetprofiles_controller_spec.rb | 6 +- spec/controllers/gremien_controller_spec.rb | 6 +- .../neuigkeiten_controller_spec.rb | 8 +- spec/factories/attachments.rb | 6 +- spec/factories/beispiele.rb | 8 +- spec/factories/calendars.rb | 6 +- spec/factories/calentries.rb | 10 +- spec/factories/comments.rb | 2 +- spec/factories/crawlobjects.rb | 32 +- spec/factories/documents.rb | 12 +- spec/factories/fetprofiles.rb | 40 +- spec/factories/fetzneditions.rb | 10 +- spec/factories/fotos.rb | 10 +- spec/factories/fragen.rb | 6 +- spec/factories/galleries.rb | 8 +- spec/factories/gremien.rb | 8 +- spec/factories/keys.rb | 14 +- spec/factories/lecturers.rb | 10 +- spec/factories/lvas.rb | 18 +- spec/factories/meetings.rb | 14 +- spec/factories/meetingtyps.rb | 10 +- spec/factories/memberships.rb | 12 +- spec/factories/modulgruppen.rb | 14 +- spec/factories/moduls.rb | 10 +- spec/factories/neuigkeit.rb | 8 +- spec/factories/nlinks.rb | 12 +- spec/factories/rubrik.rb | 8 +- spec/factories/semester_factory.rb | 8 +- spec/factories/studien.rb | 18 +- spec/factories/studien.rb~ | 2 +- spec/factories/survey_answers.rb | 6 +- spec/factories/survey_choices.rb | 10 +- spec/factories/survey_questions.rb | 8 +- spec/factories/themen.rb | 6 +- spec/factories/themengruppen.rb | 6 +- spec/factories/users.rb | 8 +- spec/features/admin_spec.rb | 12 +- spec/features/beispielsammlung_spec.rb | 12 +- spec/mailers/news_mailer_spec.rb | 6 +- spec/models/attachment_spec.rb | 2 +- spec/models/beispiel_spec.rb | 14 +- spec/models/calendar_spec.rb | 4 +- spec/models/calentry_spec.rb | 12 +- spec/models/fetprofile_spec.rb | 8 +- spec/models/gremium_spec.rb | 18 +- spec/models/lva_spec.rb | 2 +- spec/models/meeting_spec.rb | 14 +- spec/models/meetingtyp_spec.rb | 4 +- spec/models/modul_spec.rb | 4 +- spec/models/modulgruppe_spec.rb | 24 +- spec/models/neuigkeit_spec.rb | 12 +- spec/models/rubrik_spec.rb | 2 +- spec/models/studium_spec.rb | 12 +- spec/models/thema_spec.rb | 8 +- spec/models/themengruppe_spec.rb | 2 +- spec/support/controller_macros.rb | 8 +- spec/support/model_macros.rb | 12 +- spec/support/view_macros.rb | 4 +- spec/views/fetprofiles/edit.html.erb_spec.rb | 2 +- .../fetprofiles/fetprofile.html.erb_spec.rb | 4 +- spec/views/fetprofiles/index.html.erb_spec.rb | 8 +- spec/views/fetprofiles/new.html.erb_spec.rb | 2 +- spec/views/fetprofiles/show.html.erb_spec.rb | 10 +- 86 files changed, 732 insertions(+), 662 deletions(-) diff --git a/Gemfile b/Gemfile index 9f5e40a..9f3c3ad 100755 --- a/Gemfile +++ b/Gemfile @@ -1,27 +1,29 @@ source 'https://rubygems.org' -gem 'rake', '~>10.0' -gem 'rails', '3.2.13' -gem 'sprockets', '2.2.2' -gem 'webrick', '1.3.1' +gem 'rake', '~>12.3' +#gem 'rails', '3.2.13' +gem 'rails', '~>4.0' + +gem 'sprockets'#, '2.2.2' +gem 'webrick'#, '1.3.1' # Bundle edge Rails instead: # gem 'rails', :git => 'git://github.com/rails/rails.git' - gem 'mysql2', '~>0.3.10' - gem 'sqlite3' + gem 'mysql2'#, '~>0.3.10' + gem 'sqlite3', '~>1.3.0' gem 'execjs', '~>1.4.0' gem 'sanitize', :git=>'git://github.com/rgrove/sanitize' # Gems used only for assets and not required # in production environments by default. - gem 'sass-rails', '~> 3.0' - gem 'coffee-rails', '~> 3.0' - gem 'bootstrap-sass','~> 2.3.2.1' + gem 'sass-rails', '~> 5.0' + gem 'coffee-rails', '~> 4.2.2' + gem 'bootstrap-sass','~> 3.4' -group :assets do +#group :assets do # See https://github.com/sstephenson/execjs#readme for more supported runtimes gem 'therubyracer', :platforms => :ruby - gem 'uglifier', '>= 1.0.3' -end + gem 'uglifier'#, '>= 1.0.3' +#end gem 'active_record_query_trace' gem 'jquery-rails' @@ -33,7 +35,7 @@ gem 'jquery-rails' # gem 'jbuilder' # Use unicorn as the app server - gem 'unicorn', '~>4.8.0' + gem 'unicorn', '~>5.4' #4.8.0' # Deploy with Capistran # gem 'capistrano' @@ -43,7 +45,7 @@ gem 'jquery-rails' # Formbuilder for easier form generation -gem 'formtastic', '~>2.2.1' +gem 'formtastic', '~>3.1' # gem 'formtastic-bootstrap', '~>2.1.3' #, :git => "git://github.com/mjbellantoni/formtastic-bootstrap.git" gem 'formtastic-bootstrap', '~>3.0.0' #, :git => "git://github.com/mjbellantoni/formtastic-bootstrap.git" @@ -52,29 +54,29 @@ gem "tinymce-rails" , '~>4.1.0' # Internationalisierung #gem "globalize3" ,'~>3.0.4' -gem "globalize" ,'~>3.0.4'#,:git =>'git://github.com/globalize/globalize.git' +gem "globalize" ,'~>4.0'#,:git =>'git://github.com/globalize/globalize.git' gem 'globalize-versioning' gem 'globalize-accessors' # Version controll -gem "paper_trail" , '~>3.0.5'#, :git=>'git://github.com/airblade/paper_trail.git' +gem "paper_trail" # , '~>3.0.5i'#, :git=>'git://github.com/airblade/paper_trail.git' # User management -gem "devise" ,'~>2.2.3' -gem "omniauth", '~>1.2.2' -gem "omniauth-facebook", '~>2.0.0' -gem "omniauth-ldap", '~>1.0.4' +gem "devise" #,'~>2.2.3' +gem "omniauth" , '~>1.6' +gem "omniauth-facebook" #, '~>2.0.0' +gem "omniauth-ldap" #, '~>1.0.4' -gem "fb_graph",'~>2.7.17' +gem "fb_graph" #,'~>2.7.17' gem "meta-tags" # Roles for users -gem "rolify", '~>4.0.0' +gem "rolify" # , '~>4.0.0' # Abilities -gem "cancan", '~>1.6.0' +gem "cancan" #, '~>1.6.0' # Fileupload -gem 'paperclip' ,'~>3.4.0' +gem 'paperclip' #,'~>3.4.0' gem 'git' gem 'haml' @@ -82,37 +84,38 @@ gem 'haml' #gem 'wikicloth' #gem 'gollum-lib' gem 'awesome_nested_set' -gem 'annotate', "~>2.6.0" -gem 'carrierwave', "~>0.9.0" +gem 'annotate' #, "~>2.6.0" +gem 'carrierwave'#, "~>0.9.0" group :development, :test do -gem 'factory_girl_rails',"~>4.5.0" -gem 'minitest', "~>4.7.5" +gem 'factory_bot_rails'#,"~>4.5.0" +gem 'minitest'#, "~>4.7.5" gem 'progress_bar' -gem 'rspec-core', '~>3.3.0' -gem 'rspec-support', '~>3.3.0' -gem 'rspec-rails', '~>3.3.0' -gem 'rspec-collection_matchers', '~>1.1.2' -gem 'rspec-activemodel-mocks', '~>1.0.1' -gem 'rspec-html-matchers', '~>0.7.0' -gem 'rspec-expectations', '~>3.3.1' -gem 'capybara', '~>2.5.0' +gem 'rspec-core', '~>3.8.0' +gem 'rspec-support'#, '~>3.3.0' +gem 'rspec-rails'#, '~>3.3.0' +gem 'rspec-collection_matchers'#, '~>1.1.2' +gem 'rspec-activemodel-mocks'#, '~>1.0.1' +gem 'rspec-html-matchers'#, '~>0.7.0' +gem 'rspec-expectations'#, '~>3.3.1' +gem 'capybara'#, '~>2.5.0' gem 'simplecov' end -gem "simple_calendar", "~> 0.1.9" +gem "simple_calendar"#, "~> 0.1.9" gem 'rmagick' gem 'bootstrap-addons-rails' -gem "jquery-fileupload-rails", "0.4.1" -gem "jquery-ui-rails","~> 4.1.0" +gem "jquery-fileupload-rails"#, "0.4.1" +gem "jquery-ui-rails"#,"~> 4.1.0" gem "font-awesome-rails" gem "jquery-datetimepicker-rails" # gem "jquery-sortable-rails" -gem "seed_dump", "~> 0.5.3" +gem "seed_dump"#, "~> 0.5.3" #gem "themes_for_rails" ,:git =>'git://github.com/tkriplean/themes_for_rails.git' #gem "themes_for_rails", :git=> 'git://github.com/lucasefe/themes_for_rails.git' -gem 'themes_for_rails' +#gem 'themes_for_rails' +gem 'themes_on_rails' gem 'rubyzip' gem 'acts_as_votable' @@ -138,3 +141,10 @@ gem 'blueimp-gallery-rails' gem 'shareable' gem 'sunspot_test' + + + +# needed because of RAILS 4 +gem 'protected_attributes' + +gem 'actionpack-action_caching' diff --git a/Gemfile.lock b/Gemfile.lock index d5974f0..8bf9706 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,96 +8,108 @@ GIT GIT remote: git://github.com/rgrove/sanitize - revision: acc7e6440139379a0c6b4b76b662ed90acd4b923 + revision: 424f02f4fd279e650117d32388d0840097dbc4c9 specs: - sanitize (4.6.4) + sanitize (5.0.0) crass (~> 1.0.2) - nokogiri (>= 1.4.4) - nokogumbo (~> 1.4) + nokogiri (>= 1.8.0) + nokogumbo (~> 2.0) GEM remote: https://rubygems.org/ specs: - actionmailer (3.2.13) - actionpack (= 3.2.13) - mail (~> 2.5.3) - actionpack (3.2.13) - activemodel (= 3.2.13) - activesupport (= 3.2.13) - builder (~> 3.0.0) + actionmailer (4.2.11) + actionpack (= 4.2.11) + actionview (= 4.2.11) + activejob (= 4.2.11) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 1.0, >= 1.0.5) + actionpack (4.2.11) + actionview (= 4.2.11) + activesupport (= 4.2.11) + rack (~> 1.6) + rack-test (~> 0.6.2) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionpack-action_caching (1.2.0) + actionpack (>= 4.0.0, < 6) + actionview (4.2.11) + activesupport (= 4.2.11) + builder (~> 3.1) erubis (~> 2.7.0) - journey (~> 1.0.4) - rack (~> 1.4.5) - rack-cache (~> 1.2) - rack-test (~> 0.6.1) - sprockets (~> 2.2.1) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.3) active_record_query_trace (1.5.4) - activemodel (3.2.13) - activesupport (= 3.2.13) - builder (~> 3.0.0) - activerecord (3.2.13) - activemodel (= 3.2.13) - activesupport (= 3.2.13) - arel (~> 3.0.2) - tzinfo (~> 0.3.29) - activeresource (3.2.13) - activemodel (= 3.2.13) - activesupport (= 3.2.13) - activesupport (3.2.13) - i18n (= 0.6.1) - multi_json (~> 1.0) - acts_as_votable (0.11.1) - addressable (2.5.2) + activejob (4.2.11) + activesupport (= 4.2.11) + globalid (>= 0.3.0) + activemodel (4.2.11) + activesupport (= 4.2.11) + builder (~> 3.1) + activerecord (4.2.11) + activemodel (= 4.2.11) + activesupport (= 4.2.11) + arel (~> 6.0) + activesupport (4.2.11) + i18n (~> 0.7) + minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) + tzinfo (~> 1.1) + acts_as_votable (0.12.0) + addressable (2.6.0) public_suffix (>= 2.0.2, < 4.0) aes_key_wrap (1.0.1) - annotate (2.6.10) - activerecord (>= 3.2, <= 4.3) - rake (~> 10.4) - arel (3.0.3) + annotate (2.7.4) + activerecord (>= 3.2, < 6.0) + rake (>= 10.4, < 13.0) + arel (6.0.4) attr_required (1.0.1) - awesome_nested_set (2.1.6) - activerecord (>= 3.0.0) - bcrypt (3.1.11) - bcrypt-ruby (3.1.5) - bcrypt (>= 3.1.3) - bindata (2.4.3) + autoprefixer-rails (9.4.7) + execjs + awesome_nested_set (3.1.4) + activerecord (>= 4.0.0, < 5.3) + bcrypt (3.1.12) + bindata (2.4.4) blueimp-gallery (2.11.0.1) railties (>= 3.1.0) blueimp-gallery-rails (2.7.0) railties (>= 3.0, < 5.0) bootstrap-addons-rails (0.1.2) rails - bootstrap-sass (2.3.2.2) - sass (~> 3.2) - builder (3.0.4) + bootstrap-sass (3.4.1) + autoprefixer-rails (>= 5.2.1) + sassc (>= 2.0.0) + builder (3.2.3) cancan (1.6.10) - capybara (2.5.0) + capybara (3.13.2) + addressable + mini_mime (>= 0.1.3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (~> 1.2) + xpath (~> 3.2) + carrierwave (1.3.1) + activemodel (>= 4.0.0) + activesupport (>= 4.0.0) mime-types (>= 1.16) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - xpath (~> 2.0) - carrierwave (0.9.0) - activemodel (>= 3.2.0) - activesupport (>= 3.2.0) - json (>= 1.7) chronic (0.10.2) climate_control (0.2.0) - cocaine (0.5.8) - climate_control (>= 0.0.3, < 1.0) - coffee-rails (3.2.2) + coffee-rails (4.2.2) coffee-script (>= 2.2.0) - railties (~> 3.2.0) + railties (>= 4.0.0) coffee-script (2.4.1) coffee-script-source execjs coffee-script-source (1.12.2) + concurrent-ruby (1.1.4) crass (1.0.4) - devise (2.2.8) - bcrypt-ruby (~> 3.0) + devise (4.6.1) + bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (~> 3.1) - warden (~> 1.2.1) + railties (>= 4.1.0, < 6.0) + responders + warden (~> 1.2.3) diff-lcs (1.3) docile (1.3.1) domain_name (0.5.20180417) @@ -107,29 +119,31 @@ GEM rest-client (>= 1.6) execjs (1.4.1) multi_json (~> 1.0) - factory_girl (4.5.0) - activesupport (>= 3.0.0) - factory_girl_rails (4.5.0) - factory_girl (~> 4.5.0) - railties (>= 3.0.0) - faraday (0.12.2) + factory_bot (5.0.1) + activesupport (>= 4.2.0) + factory_bot_rails (5.0.1) + factory_bot (~> 5.0.0) + railties (>= 4.2.0) + faraday (0.15.4) multipart-post (>= 1.2, < 3) fb_graph (2.7.17) httpclient (>= 2.4) multi_json (>= 1.3) rack-oauth2 (>= 0.14.4) tzinfo - ffi (1.9.23) + ffi (1.9.25) font-awesome-rails (4.7.0.4) railties (>= 3.2, < 6.0) - formtastic (2.2.1) - actionpack (>= 3.0) + formtastic (3.1.5) + actionpack (>= 3.2.13) formtastic-bootstrap (3.0.0) formtastic (>= 2.2) - git (1.3.0) - globalize (3.0.5) - activemodel (>= 3.0.0, < 4.0.0) - activerecord (>= 3.0.0, < 4.0.0) + git (1.5.0) + globalid (0.4.2) + activesupport (>= 4.2.0) + globalize (4.0.3) + activemodel (>= 4.0.0, < 5) + activerecord (>= 4.0.0, < 5) globalize-accessors (0.1.5) globalize (>= 3) globalize-versioning (0.2.0) @@ -140,195 +154,232 @@ GEM haml (5.0.4) temple (>= 0.8.0) tilt - hashie (3.5.7) - highline (1.7.10) - hike (1.2.3) + hashie (3.6.0) + highline (2.0.1) http-cookie (1.0.3) domain_name (~> 0.5) httpclient (2.8.3) - i18n (0.6.1) - journey (1.0.4) + i18n (0.9.5) + concurrent-ruby (~> 1.0) jquery-datetimepicker-rails (2.4.1.0) - jquery-fileupload-rails (0.4.1) + jquery-fileupload-rails (1.0.0) actionpack (>= 3.1) railties (>= 3.1) - jquery-rails (3.1.5) - railties (>= 3.0, < 5.0) + sassc + jquery-rails (4.3.3) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) thor (>= 0.14, < 2.0) - jquery-ui-rails (4.1.2) - railties (>= 3.1.0) + jquery-ui-rails (6.0.1) + railties (>= 3.2.16) json (2.1.0) - json-jwt (1.9.4) - activesupport + json-jwt (1.10.0) + activesupport (>= 4.2) aes_key_wrap bindata - jwt (1.5.6) - kaminari (0.17.0) - actionpack (>= 3.0.0) - activesupport (>= 3.0.0) + jwt (2.1.0) + kaminari (1.1.1) + activesupport (>= 4.1.0) + kaminari-actionview (= 1.1.1) + kaminari-activerecord (= 1.1.1) + kaminari-core (= 1.1.1) + kaminari-actionview (1.1.1) + actionview + kaminari-core (= 1.1.1) + kaminari-activerecord (1.1.1) + activerecord + kaminari-core (= 1.1.1) + kaminari-core (1.1.1) kgio (2.11.2) libv8 (3.16.14.19) - mail (2.5.5) - mime-types (~> 1.16) - treetop (~> 1.4.8) - meta-tags (2.9.0) - actionpack (>= 3.2.0, < 5.3) - mime-types (1.25.1) - mini_portile2 (2.3.0) - minitest (4.7.5) + loofah (2.2.3) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + meta-tags (2.11.1) + actionpack (>= 3.2.0, < 6.1) + mime-types (3.2.2) + mime-types-data (~> 3.2015) + mime-types-data (3.2018.0812) + mimemagic (0.3.3) + mini_mime (1.0.1) + mini_portile2 (2.4.0) + minitest (5.11.3) multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.0.0) - mysql2 (0.3.21) + mysql2 (0.5.2) net-ldap (0.16.1) netrc (0.11.0) - nokogiri (1.8.2) - mini_portile2 (~> 2.3.0) - nokogumbo (1.5.0) - nokogiri - oauth2 (1.4.0) - faraday (>= 0.8, < 0.13) - jwt (~> 1.0) + nokogiri (1.10.1) + mini_portile2 (~> 2.4.0) + nokogumbo (2.0.1) + nokogiri (~> 1.8, >= 1.8.4) + oauth2 (1.4.1) + faraday (>= 0.8, < 0.16.0) + jwt (>= 1.0, < 3.0) multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) - omniauth (1.2.2) - hashie (>= 1.2, < 4) - rack (~> 1.0) - omniauth-facebook (2.0.1) + omniauth (1.9.0) + hashie (>= 3.4.6, < 3.7.0) + rack (>= 1.6.2, < 3) + omniauth-facebook (5.0.0) omniauth-oauth2 (~> 1.2) omniauth-ldap (1.0.5) net-ldap (~> 0.12) omniauth (~> 1.0) pyu-ruby-sasl (~> 0.0.3.2) rubyntlm (~> 0.3.4) - omniauth-oauth2 (1.5.0) + omniauth-oauth2 (1.6.0) oauth2 (~> 1.1) - omniauth (~> 1.2) + omniauth (~> 1.9) opengraph_parser (0.2.3) addressable nokogiri options (2.3.2) orm_adapter (0.5.0) - paper_trail (3.0.9) - activerecord (>= 3.0, < 5.0) - activesupport (>= 3.0, < 5.0) - paperclip (3.4.2) - activemodel (>= 3.0.0) - activerecord (>= 3.0.0) - activesupport (>= 3.0.0) - cocaine (~> 0.5.0) + paper_trail (4.2.0) + activerecord (>= 3.0, < 6.0) + activesupport (>= 3.0, < 6.0) + request_store (~> 1.1) + paperclip (6.1.0) + activemodel (>= 4.2.0) + activesupport (>= 4.2.0) mime-types - polyglot (0.3.5) + mimemagic (~> 0.3.0) + terrapin (~> 0.6.0) pr_geohash (1.0.0) - progress_bar (1.2.0) - highline (~> 1.6) + progress_bar (1.3.0) + highline (>= 1.6, < 3) options (~> 2.3.0) - public_suffix (3.0.2) + protected_attributes (1.1.4) + activemodel (>= 4.0.1, < 5.0) + public_suffix (3.0.3) pyu-ruby-sasl (0.0.3.3) - rack (1.4.7) - rack-cache (1.7.2) - rack (>= 0.4) - rack-oauth2 (1.9.2) + rack (1.6.11) + rack-oauth2 (1.9.3) activesupport attr_required httpclient json-jwt (>= 1.9.0) rack - rack-ssl (1.3.4) - rack rack-test (0.6.3) rack (>= 1.0) - rails (3.2.13) - actionmailer (= 3.2.13) - actionpack (= 3.2.13) - activerecord (= 3.2.13) - activeresource (= 3.2.13) - activesupport (= 3.2.13) - bundler (~> 1.0) - railties (= 3.2.13) - railties (3.2.13) - actionpack (= 3.2.13) - activesupport (= 3.2.13) - rack-ssl (~> 1.3.2) + rails (4.2.11) + actionmailer (= 4.2.11) + actionpack (= 4.2.11) + actionview (= 4.2.11) + activejob (= 4.2.11) + activemodel (= 4.2.11) + activerecord (= 4.2.11) + activesupport (= 4.2.11) + bundler (>= 1.3.0, < 2.0) + railties (= 4.2.11) + sprockets-rails + rails-deprecated_sanitizer (1.0.3) + activesupport (>= 4.2.0.alpha) + rails-dom-testing (1.0.9) + activesupport (>= 4.2.0, < 5.0) + nokogiri (~> 1.6) + rails-deprecated_sanitizer (>= 1.0.1) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (4.2.11) + actionpack (= 4.2.11) + activesupport (= 4.2.11) rake (>= 0.8.7) - rdoc (~> 3.4) - thor (>= 0.14.6, < 2.0) + thor (>= 0.18.1, < 2.0) raindrops (0.19.0) - rake (10.5.0) + rake (12.3.2) rb-fsevent (0.10.3) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) - rdoc (3.9.5) + rb-inotify (0.10.0) + ffi (~> 1.0) ref (2.0.0) + regexp_parser (1.3.0) + request_store (1.4.1) + rack (>= 1.4) + responders (2.4.1) + actionpack (>= 4.2.0, < 6.0) + railties (>= 4.2.0, < 6.0) rest-client (2.0.2) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) rmagick (2.16.0) - rolify (4.0.0) + rolify (5.2.0) rsolr (2.2.1) builder (>= 2.1.2) faraday (>= 0.9.0) - rspec (3.3.0) - rspec-core (~> 3.3.0) - rspec-expectations (~> 3.3.0) - rspec-mocks (~> 3.3.0) - rspec-activemodel-mocks (1.0.3) + rspec (3.8.0) + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-activemodel-mocks (1.1.0) activemodel (>= 3.0) activesupport (>= 3.0) rspec-mocks (>= 2.99, < 4.0) rspec-collection_matchers (1.1.3) rspec-expectations (>= 2.99.0.beta1) - rspec-core (3.3.2) - rspec-support (~> 3.3.0) - rspec-expectations (3.3.1) + rspec-core (3.8.0) + rspec-support (~> 3.8.0) + rspec-expectations (3.8.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.3.0) - rspec-html-matchers (0.7.3) + rspec-support (~> 3.8.0) + rspec-html-matchers (0.9.1) nokogiri (~> 1) rspec (>= 3.0.0.a, < 4) - rspec-mocks (3.3.2) + rspec-mocks (3.8.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.3.0) - rspec-rails (3.3.3) - actionpack (>= 3.0, < 4.3) - activesupport (>= 3.0, < 4.3) - railties (>= 3.0, < 4.3) - rspec-core (~> 3.3.0) - rspec-expectations (~> 3.3.0) - rspec-mocks (~> 3.3.0) - rspec-support (~> 3.3.0) - rspec-support (3.3.0) + rspec-support (~> 3.8.0) + rspec-rails (3.8.2) + actionpack (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-support (~> 3.8.0) + rspec-support (3.8.0) rubyntlm (0.3.4) - rubyzip (1.2.1) - sass (3.5.6) + rubyzip (1.2.2) + sass (3.7.3) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - sass-rails (3.2.6) - railties (~> 3.2.0) - sass (>= 3.1.10) - tilt (~> 1.3) - seed_dump (0.5.3) + sass-rails (5.0.7) + railties (>= 4.0.0, < 6) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (>= 1.1, < 3) + sassc (2.0.0) + ffi (~> 1.9.6) + rake + seed_dump (3.3.1) + activerecord (>= 4) + activesupport (>= 4) shareable (1.1.4) actionpack (>= 3.0.0) activesupport (>= 3.0.0) - simple_calendar (0.1.11) + simple_calendar (2.3.0) rails (>= 3.0) simplecov (0.16.1) docile (~> 1.1) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.2) - sitemap_generator (6.0.1) + sitemap_generator (6.0.2) builder (~> 3.0) - sprockets (2.2.2) - hike (~> 1.2) - multi_json (~> 1.0) - rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) sqlite3 (1.3.13) sunspot (2.3.0) pr_geohash (~> 1.0) @@ -341,114 +392,116 @@ GEM sunspot_rails (>= 2.1.1) sunspot_solr temple (0.8.0) - themes_for_rails (0.5.1) - rails (>= 3.0.0) + terrapin (0.6.0) + climate_control (>= 0.0.3, < 1.0) + themes_on_rails (0.4.0) + rails (>= 3.2) therubyracer (0.12.3) libv8 (~> 3.16.14.15) ref - thor (0.20.0) - tilt (1.4.1) + thor (0.20.3) + thread_safe (0.3.6) + tilt (2.0.9) tinymce-rails (4.1.10) railties (>= 3.1.1) - treetop (1.4.15) - polyglot - polyglot (>= 0.3.1) - tzinfo (0.3.54) - uglifier (4.1.10) + tzinfo (1.2.5) + thread_safe (~> 0.1) + uglifier (4.1.20) execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext unf_ext (0.0.7.5) - unicorn (4.8.3) + unicorn (5.4.1) kgio (~> 2.6) - rack raindrops (~> 0.7) warden (1.2.7) rack (>= 1.0) - webrick (1.3.1) + webrick (1.4.2) whenever (0.10.0) chronic (>= 0.6.3) - xpath (2.1.0) - nokogiri (~> 1.3) - yaml_db (0.6.0) - rails (>= 3.0, < 5.2) + xpath (3.2.0) + nokogiri (~> 1.8) + yaml_db (0.7.0) + rails (>= 3.0) rake (>= 0.8.7) PLATFORMS ruby DEPENDENCIES + actionpack-action_caching active_record_query_trace acts_as_votable - annotate (~> 2.6.0) + annotate awesome_nested_set blueimp-gallery blueimp-gallery-rails bootstrap-addons-rails bootstrap-kaminari-views! - bootstrap-sass (~> 2.3.2.1) - cancan (~> 1.6.0) - capybara (~> 2.5.0) - carrierwave (~> 0.9.0) - coffee-rails (~> 3.0) - devise (~> 2.2.3) + bootstrap-sass (~> 3.4) + cancan + capybara + carrierwave + coffee-rails (~> 4.2.2) + devise etherpad-lite execjs (~> 1.4.0) - factory_girl_rails (~> 4.5.0) - fb_graph (~> 2.7.17) + factory_bot_rails + fb_graph font-awesome-rails - formtastic (~> 2.2.1) + formtastic (~> 3.1) formtastic-bootstrap (~> 3.0.0) git - globalize (~> 3.0.4) + globalize (~> 4.0) globalize-accessors globalize-versioning haml jquery-datetimepicker-rails - jquery-fileupload-rails (= 0.4.1) + jquery-fileupload-rails jquery-rails - jquery-ui-rails (~> 4.1.0) + jquery-ui-rails kaminari meta-tags - minitest (~> 4.7.5) - mysql2 (~> 0.3.10) - omniauth (~> 1.2.2) - omniauth-facebook (~> 2.0.0) - omniauth-ldap (~> 1.0.4) + minitest + mysql2 + omniauth (~> 1.6) + omniauth-facebook + omniauth-ldap opengraph_parser - paper_trail (~> 3.0.5) - paperclip (~> 3.4.0) + paper_trail + paperclip progress_bar - rails (= 3.2.13) - rake (~> 10.0) + protected_attributes + rails (~> 4.0) + rake (~> 12.3) rmagick - rolify (~> 4.0.0) - rspec-activemodel-mocks (~> 1.0.1) - rspec-collection_matchers (~> 1.1.2) - rspec-core (~> 3.3.0) - rspec-expectations (~> 3.3.1) - rspec-html-matchers (~> 0.7.0) - rspec-rails (~> 3.3.0) - rspec-support (~> 3.3.0) + rolify + rspec-activemodel-mocks + rspec-collection_matchers + rspec-core (~> 3.8.0) + rspec-expectations + rspec-html-matchers + rspec-rails + rspec-support rubyzip sanitize! - sass-rails (~> 3.0) - seed_dump (~> 0.5.3) + sass-rails (~> 5.0) + seed_dump shareable - simple_calendar (~> 0.1.9) + simple_calendar simplecov sitemap_generator - sprockets (= 2.2.2) - sqlite3 + sprockets + sqlite3 (~> 1.3.0) sunspot_rails sunspot_solr sunspot_test - themes_for_rails + themes_on_rails therubyracer tinymce-rails (~> 4.1.0) - uglifier (>= 1.0.3) - unicorn (~> 4.8.0) - webrick (= 1.3.1) + uglifier + unicorn (~> 5.4) + webrick whenever yaml_db diff --git a/app/models/attachment.rb b/app/models/attachment.rb index 705ddae..0f6cc32 100644 --- a/app/models/attachment.rb +++ b/app/models/attachment.rb @@ -18,7 +18,7 @@ class Attachment < ActiveRecord::Base # validates :thema, :presence => true validates :name, :presence => true scope :titlepic, ->{where(flag_titlepic: true)} - default_scope order("LOWER(name)") + default_scope { order("LOWER(name)") } belongs_to :parent, :polymorphic=>true def image? diff --git a/app/models/calentry.rb b/app/models/calentry.rb index 6421632..8dafe3d 100644 --- a/app/models/calentry.rb +++ b/app/models/calentry.rb @@ -103,6 +103,6 @@ end I18n.l(self.start) +" "+ I18n.t("cal.bis")+" "+ I18n.l(self.ende, :format=>format) end end - scope :public, -> { where(:public => :true) } +# scope :public, -> { where(:public => :true) } # scope :upcoming, -> { where("start >= ?" , Time.now).where("start <= ?", 28.days.from_now) } end diff --git a/app/models/comment.rb b/app/models/comment.rb index 9a0c5cd..fe4b151 100644 --- a/app/models/comment.rb +++ b/app/models/comment.rb @@ -5,9 +5,9 @@ class Comment < ActiveRecord::Base acts_as_nested_set :scope => [:commentable_id, :commentable_type] belongs_to :commentable, :polymorphic=> true belongs_to :user - validate :text, :presence=>true - validate :user, :presence=>true - validate :commentable, :presence=>true + validates :text, :presence=>true + validates :user, :presence=>true + validates :commentable, :presence=>true include IsCommentable NUM = {"Beispiel"=> 2, "Survey::Question"=> 7} def parent_object diff --git a/app/models/document.rb b/app/models/document.rb index bb772ea..59cdb97 100644 --- a/app/models/document.rb +++ b/app/models/document.rb @@ -3,10 +3,10 @@ class Document < ActiveRecord::Base attr_accessible :name, :parent, :text, :typ, :parent_id, :parent_type belongs_to :parent, :polymorphic => true - validate :name, :length=>{minimum:3} - validate :text, :presence=>true - validate :typ, :presence=>true - validate :parent, :presence=>true + validates :name, :length=>{minimum:3} + validates :text, :presence=>true + validates :typ, :presence=>true + validates :parent, :presence=>true has_paper_trail TYPS = { 1=>"fet_docs", 10=>"protocol", 11=> "agenda"} has_many :attachments, :as=>:parent diff --git a/app/models/gallery.rb b/app/models/gallery.rb index 1bb18fc..062c21c 100644 --- a/app/models/gallery.rb +++ b/app/models/gallery.rb @@ -15,7 +15,7 @@ class Gallery < ActiveRecord::Base attr_accessible :datum, :desc, :name, :foto_ids has_many :fotos, :dependent => :destroy # Delete fotos if gallery is destroyed has_many :nlinks, as: :link - default_scope order("galleries.datum").reverse_order + default_scope { order("galleries.datum").reverse_order } searchable do text :desc text :name, :boost=>3.0 diff --git a/app/models/lva.rb b/app/models/lva.rb index 598759d..c8ad6a6 100755 --- a/app/models/lva.rb +++ b/app/models/lva.rb @@ -37,7 +37,7 @@ class Lva < ActiveRecord::Base # scope :search, ->(query) {where("name like ? or lvas.desc like ?", "%#{query}%", "%#{query}%")} - validates :lvanr,:format=>{ :with => /^[0-9][0-9][0-9]\.[0-9A][0-9][0-9]$/}, :presence=>true, :uniqueness=>true # , :uniqueness=>true # LVA-Nummer muss das Format 000.000 besitzen (uniqueness?) oder 000 für nicht + validates :lvanr,:format=>{ :with => /\A[0-9][0-9][0-9]\.[0-9A][0-9][0-9]\z/}, :presence=>true, :uniqueness=>true # , :uniqueness=>true # LVA-Nummer muss das Format 000.000 besitzen (uniqueness?) oder 000 für nicht validates_presence_of :ects # ECTS vorhanden? validates :name, :presence=>true, :uniqueness=>{:scope=>:typ}# Name Eingetragen? validates :typ, :presence=>true, :inclusion=> ERLAUBTE_TYPEN diff --git a/app/models/meeting.rb b/app/models/meeting.rb index 3345d79..3eb1883 100644 --- a/app/models/meeting.rb +++ b/app/models/meeting.rb @@ -13,9 +13,12 @@ class Meeting < ActiveRecord::Base # Belongs to a news article, that is usually the Announcement of that meeting belongs_to :neuigkeit, touch: true # has one protocol of type Document, which is of typ=10=protocol - has_one :protocol, :class_name=>'Document', :conditions=>{:typ=>10}, :as=>:parent +#has_one :test_ol, :class_name=>'Document', -> { where(:typ => 10) } + + has_one :protocol, -> { where(:typ => 10) }, :class_name=>'Document', :as=>:parent + # has one agenda of type Document - has_one :agenda , :as=>:parent,:conditions=>{:typ=>11}, :class_name=>'Document' + has_one :agenda, -> { where :typ=>11 } , :as=>:parent, :class_name=>'Document' # has one calentry which contains the date and time of this meeting has_one :calentry, as: :object, :dependent=> :destroy # has one calendar through the meetingtyp, thus each meeting is put into a calendar @@ -24,14 +27,14 @@ class Meeting < ActiveRecord::Base has_one :rubrik, :through=>:meetingtyp # scope upcomming only contains meetings in the future and 1 hour into the past - scope :upcomming, includes(:calentry).where("calentries.start>?",1.hour.ago) - default_scope includes(:calentry).order("calentries.start").reverse_order + scope :upcomming, -> {includes(:calentry).where("calentries.start>?",1.hour.ago)} + default_scope -> { includes(:calentry).order("calentries.start").reverse_order} accepts_nested_attributes_for :calentry # Each meeting is required to have a parent otherwise it will not be shown anywhere on the website - validate :parent, :presence=>true + validates :parent, :presence=>true # Each meeting needs a calendar entry - validate :calentry, :presence=>true + validates :calentry, :presence=>true # before each validation fix the calendar entry such that it is always diff --git a/app/models/meetingtyp.rb b/app/models/meetingtyp.rb index 48b10b8..604d4b2 100644 --- a/app/models/meetingtyp.rb +++ b/app/models/meetingtyp.rb @@ -5,8 +5,8 @@ class Meetingtyp < ActiveRecord::Base validates :name, :presence=>true has_many :meetings has_one :calendar, through: :rubrik - has_one :protocol, :class_name=>'Document', :conditions=>{:typ=>10}, :as=>:parent - has_one :agenda , :as=>:parent, :conditions=>{:typ=>11}, :class_name=>'Document' + has_one :protocol, -> {where(:typ=>10)}, :class_name=>'Document', :as=>:parent + has_one :agenda, -> {where(:typ=>11)} , :as=>:parent, :class_name=>'Document' mount_uploader :picture, PictureUploader diff --git a/app/models/neuigkeit.rb b/app/models/neuigkeit.rb index f7b705b..fbe54b8 100755 --- a/app/models/neuigkeit.rb +++ b/app/models/neuigkeit.rb @@ -21,7 +21,7 @@ class Neuigkeit < ActiveRecord::Base has_many :nlinks, :dependent=> :destroy has_one :meeting has_many :attachments, :as=>:parent - has_one :title_pic, :class_name=>"Attachment", :as=>:parent, :conditions=>["attachments.flag_titlepic =?", true] + has_one :title_pic, -> {where("attachments.flag_titlepic =?", true)}, :class_name=>"Attachment", :as=>:parent has_many :questions, :class_name=>"Survey::Question", as: :parent @@ -32,11 +32,11 @@ class Neuigkeit < ActiveRecord::Base mount_uploader :picture, PictureUploader include IsCommentable - default_scope order(:cache_order).includes(:calentries).includes(:title_pic) + default_scope { order(:cache_order).includes(:calentries).includes(:title_pic) } scope :recent, -> { published.limit(10)} scope :unpublished, -> {where("datum > ? OR datum IS NULL", Time.now)} scope :published_scope, ->{where("datum <= ? AND datum IS NOT NULL", Time.now)} - scope :public, ->{includes(:rubrik).where("rubriken.public"=>true)} +# scope :public, ->{includes(:rubrik).where("rubriken.public"=>true)} scope :intern, ->{includes(:rubrik).where("rubriken.public"=>false)} # scope :search, ->(query) {where("text like ? or title like ?", "%#{query}%", "%#{query}%")} diff --git a/app/models/nlink.rb b/app/models/nlink.rb index 818d225..5710aa9 100644 --- a/app/models/nlink.rb +++ b/app/models/nlink.rb @@ -5,6 +5,6 @@ class Nlink < ActiveRecord::Base validates :neuigkeit, :presence=>true validates :link, :presence=>true validates :link_id, :uniqueness=>{:scope=>[:neuigkeit_id,:link_type]} - default_scope includes(:neuigkeit).order("neuigkeiten.datum").reverse_order + default_scope -> {includes(:neuigkeit).order("neuigkeiten.datum").reverse_order} end diff --git a/app/models/rubrik.rb b/app/models/rubrik.rb index 636f508..4535872 100755 --- a/app/models/rubrik.rb +++ b/app/models/rubrik.rb @@ -13,7 +13,7 @@ class Rubrik < ActiveRecord::Base attr_accessible :desc, :name, :prio, :calendar, :public, :icon, :color has_many :neuigkeiten, :class_name => "Neuigkeit" - has_many :published, :class_name => "Neuigkeit", :conditions=>["Neuigkeit.published"] + has_many :published, -> {where(published: True)}, :class_name => "Neuigkeit" has_many :calentries, :through => :neuigkeiten, :as=>:object resourcify has_many :meetingtyps diff --git a/app/models/studium.rb b/app/models/studium.rb index b3763e6..7540367 100755 --- a/app/models/studium.rb +++ b/app/models/studium.rb @@ -34,10 +34,10 @@ class Studium < ActiveRecord::Base has_many :lvas, :through=>:moduls has_many :semester, :dependent => :destroy has_many :attachments, :as=>:parent - validates :abkuerzung, :length=>{:maximum=>5}, :format=>{:with=>/^[a-zA-z]{0,5}$/} + validates :abkuerzung, :length=>{:maximum=>5}, :format=>{:with=>/\A[a-zA-z]{0,5}\z/} validates :typ, :inclusion => {:in => ["Bachelor","Master"] } validates :name, :uniqueness => true, :presence=>true - validates :zahl, :presence=>true, :format=>{:with=>/^[0-9A-Z]{4,10}$/}, :uniqueness => true + validates :zahl, :presence=>true, :format=>{:with=>/\A[0-9A-Z]{4,10}\z/}, :uniqueness => true mount_uploader :picture, PictureUploader diff --git a/app/models/thema.rb b/app/models/thema.rb index 36cb2e5..e87cb1e 100644 --- a/app/models/thema.rb +++ b/app/models/thema.rb @@ -24,7 +24,7 @@ class Thema < ActiveRecord::Base # Attachments can be all data formats has_many :attachments, :as=>:parent # attached pics can be used as title pictures - has_many :titlepics, :as=>:parent, :class_name=>'Attachment', :conditions=>{:flag_titlepic=>true} + has_many :titlepics, -> {where(flag_titlepic: true)}, :as=>:parent, :class_name=>'Attachment' # each topic has to belong to one group belongs_to :themengruppe, :foreign_key => "themengruppe_id", :touch=>true validates :themengruppe, :presence => true @@ -41,9 +41,9 @@ class Thema < ActiveRecord::Base validates :text, :presence => true scope :outdated, -> {includes(:translations).where("thema_translations.updated_atI18n.locale)} - scope :public, where(:isdraft=>false).includes(:themengruppe).where("themengruppen.public"=>true) + scope :published,->{ where(:isdraft=>false).includes(:themengruppe).where("themengruppen.public"=>true)} - default_scope includes(:translations).order("themen.priority").reverse_order + default_scope -> {includes(:translations).order("themen.priority").reverse_order} # make topic searchable searchable do text :text diff --git a/app/models/themengruppe.rb b/app/models/themengruppe.rb index 8a27625..2c15128 100644 --- a/app/models/themengruppe.rb +++ b/app/models/themengruppe.rb @@ -24,7 +24,7 @@ class Themengruppe < ActiveRecord::Base translates :title,:text, :versioning =>true, :fallbacks_for_empty_translations => true scope :intern,-> {where(:public=>false)} - scope :public,-> {where(:public=>true)} +# scope :public,-> {where(:public=>true)} def self.find_wiki_default where(:wiki_default=>true).first diff --git a/config/environments/development.rb b/config/environments/development.rb index c4acee2..0b92a32 100755 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -1,6 +1,8 @@ Fetsite::Application.configure do # Settings specified here will take precedence over those in config/application.rb + config.serve_static_files = false + # In the development environment your application's code is reloaded on # every request. This slows down response time but is perfect for development # since you don't have to restart the web server when you make code changes. diff --git a/config/environments/production.rb b/config/environments/production.rb index 6a6c6e4..35cd789 100755 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -3,7 +3,8 @@ Fetsite::Application.configure do # Code is not reloaded between requests config.cache_classes = true - + config.serve_static_files = true + # Full error reports are disabled and caching is turned on config.consider_all_requests_local = false config.action_controller.perform_caching = true diff --git a/config/environments/test.rb b/config/environments/test.rb index 2decd94..9f0568d 100755 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -8,7 +8,7 @@ Fetsite::Application.configure do config.cache_classes = true # Configure static asset server for tests with Cache-Control for performance - config.serve_static_assets = true + config.serve_static_files = false config.static_cache_control = "public, max-age=3600" # Log error messages when you accidentally call methods on nil diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index e80c254..559659f 100755 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -237,7 +237,7 @@ Devise.setup do |config| :bind_dn =>secrets["ldap"]['bind'], :password => secrets["ldap"]['password'] - +config.secret_key = '8dbd2a8c1cbffb76ffd5381a58078b2f1fd622e7403035cc40e9d1346d7acf6f090a3f424b2ecc8365ad435e5bfea96ddd30eec3ffe09e876a7e0033a7ab4331' # ==> Warden configuration<< # If you want to use other strategies, that are not supported by Devise, or diff --git a/config/initializers/locale.rb b/config/initializers/locale.rb index 3e10129..53a218e 100755 --- a/config/initializers/locale.rb +++ b/config/initializers/locale.rb @@ -1 +1 @@ -I18n.default_locale = :de +#I18n.default_locale = :de diff --git a/config/initializers/themes_for_rails.rb b/config/initializers/themes_for_rails.rb index 6800331..3052ee7 100644 --- a/config/initializers/themes_for_rails.rb +++ b/config/initializers/themes_for_rails.rb @@ -1,9 +1,9 @@ -ThemesForRails.config do |config| +#ThemesForRails.config do |config| # # If you have placed your themes like the example path above within the asset pipeline: - config.themes_dir = 'app/views/themes' - config.assets_dir = 'app/assets/assets/themes/:name' - config.views_dir = 'app/views/themes/:name' - config.use_sass=true +# config.themes_dir = 'app/views/themes' +# config.assets_dir = 'app/assets/assets/themes/:name' +# config.views_dir = 'app/views/themes/:name' +# config.use_sass=true # ... -end +#end diff --git a/config/routes.rb b/config/routes.rb index 1dca08f..04690a5 100755 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,51 +1,52 @@ - Fetsite::Application.routes.draw do - resources :comments, except: [:show] do - collection do - get 'hide' - end - end - - resources :comments, contstraints: {id: /[0-9]+/}, only: :show +Fetsite::Application.routes.draw do + resources :comments, except: [:show] do + collection do + get 'hide' + end + end + resources :comments, contstraints: {id: /[0-9]+/}, only: :show ## Inserted for testing tests - resources :members , controller: :fetprofiles , as: :fetprofiles do - collection do - get 'verwalten' - get 'internlist' - end - end - resources :gremien do - collection do - get 'verwalten' - end - end + resources :members , controller: :fetprofiles , as: :fetprofiles do + collection do + get 'verwalten' + get 'internlist' + end + end + resources :gremien do + collection do + get 'verwalten' + end + end # # #------------------------- - namespace :survey do - resources :questions do - member do - get :answer + namespace :survey do + resources :questions do + member do + get :answer put :answer - get 'flag' - get :create_from_template - end - end - resources :choices - - end - - themes_for_rails - devise_for :users, :controllers => { :omniauth_callbacks => "users/omniauth_callbacks" } - resources :home, :only=>[:index] do -end -resources :emails, :only=>[:index] do - collection do - get :daily_reminder + get 'flag' + get :create_from_template + end end -end + resources :choices + + end + + #themes_for_rails + + resources :home, :only=>[:index] do + end + resources :emails, :only=>[:index] do + collection do + get :daily_reminder + end + end get ':locale', constraints: {locale: /en|de/}, action: :language,controller: :home, as: "language" + + devise_for :users, :controllers => { :omniauth_callbacks => "users/omniauth_callbacks" } scope '(:locale)/admin' do resources :users, :only=>[] do collection do @@ -71,7 +72,7 @@ end end end end - devise_for :users , :controllers=>{:omniauth_callbacks=> "users/omniauth_callbacks"} +# devise_for :users , :controllers=>{:omniauth_callbacks=> "users/omniauth_callbacks"} #match '/auth/:provider/callback', to: "session#new", via: [:get, :post] diff --git a/spec/controllers/fetprofiles_controller_spec.rb b/spec/controllers/fetprofiles_controller_spec.rb index 46607d3..e06d219 100644 --- a/spec/controllers/fetprofiles_controller_spec.rb +++ b/spec/controllers/fetprofiles_controller_spec.rb @@ -6,12 +6,12 @@ describe FetprofilesController, :type => :controller do def self.create_fetprofile before(:each) do - @fetprofile = FactoryGirl.create(:fetprofile) + @fetprofile = FactoryBot.create(:fetprofile) end end def self.create_active_fetprofile before(:each) do - @fetprofile = FactoryGirl.create(:fetprofile, active: true) + @fetprofile = FactoryBot.create(:fetprofile, active: true) end end @@ -81,7 +81,7 @@ describe FetprofilesController, :type => :controller do end describe "POST create" do - subject(:action){post :create, {:fetprofile => FactoryGirl.attributes_for(:fetprofile),:format=>:html}} + subject(:action){post :create, {:fetprofile => FactoryBot.attributes_for(:fetprofile),:format=>:html}} login_fet_user describe "with valid params" do diff --git a/spec/controllers/gremien_controller_spec.rb b/spec/controllers/gremien_controller_spec.rb index 03dfc6b..95e0460 100644 --- a/spec/controllers/gremien_controller_spec.rb +++ b/spec/controllers/gremien_controller_spec.rb @@ -6,12 +6,12 @@ describe GremienController, :type => :controller do def self.create_gremium before(:each) do - @gremium = FactoryGirl.create(:gremium) + @gremium = FactoryBot.create(:gremium) end end # def self.create_active_gremium # before(:each) do -# @gremium = FactoryGirl.create(:gremium, active: true) +# @gremium = FactoryBot.create(:gremium, active: true) # end # end @@ -81,7 +81,7 @@ describe GremienController, :type => :controller do end describe "POST create" do - subject(:action){post :create, {:gremium => FactoryGirl.attributes_for(:gremium),:format=>:html}} + subject(:action){post :create, {:gremium => FactoryBot.attributes_for(:gremium),:format=>:html}} login_fet_user describe "with valid params" do diff --git a/spec/controllers/neuigkeiten_controller_spec.rb b/spec/controllers/neuigkeiten_controller_spec.rb index 832f09e..ba8be0a 100644 --- a/spec/controllers/neuigkeiten_controller_spec.rb +++ b/spec/controllers/neuigkeiten_controller_spec.rb @@ -3,8 +3,8 @@ require 'spec_helper' RSpec.describe NeuigkeitenController, :type => :controller do - let(:neuigkeit) {(FactoryGirl.create(:neuigkeit, :with_rubrik))} - let(:intern_neuigkeit) {(FactoryGirl.create(:neuigkeit,:with_intern_rubrik))} + let(:neuigkeit) {(FactoryBot.create(:neuigkeit, :with_rubrik))} + let(:intern_neuigkeit) {(FactoryBot.create(:neuigkeit,:with_intern_rubrik))} let(:valid_session) {{}} @@ -34,7 +34,7 @@ RSpec.describe NeuigkeitenController, :type => :controller do end it "denys access to unpublished news" do - neuigkeit=FactoryGirl.create(:neuigkeit, :with_rubrik, :unpublished) + neuigkeit=FactoryBot.create(:neuigkeit, :with_rubrik, :unpublished) get :show, {id: neuigkeit.id}, valid_session expect(response).to have_http_status(302) end @@ -133,7 +133,7 @@ RSpec.describe NeuigkeitenController, :type => :controller do end end describe "POST create" do - let(:action) {post :create, {rubrik_id: neuigkeit.rubrik.id, neuigkeit: FactoryGirl.attributes_for(:neuigkeit)}} + let(:action) {post :create, {rubrik_id: neuigkeit.rubrik.id, neuigkeit: FactoryBot.attributes_for(:neuigkeit)}} it_behaves_like "it is restricted" diff --git a/spec/factories/attachments.rb b/spec/factories/attachments.rb index 4bec5f0..7ea3366 100644 --- a/spec/factories/attachments.rb +++ b/spec/factories/attachments.rb @@ -1,9 +1,9 @@ # Read about factories at https://github.com/thoughtbot/factory_girl -FactoryGirl.define do +FactoryBot.define do factory :attachment do - name "MyString" +# name "MyString" datei { Rack::Test::UploadedFile.new(File.join(Rails.root,'public','fetlogo.png'))} - flag_titlepic false + # flag_titlepic false end end diff --git a/spec/factories/beispiele.rb b/spec/factories/beispiele.rb index 861645f..b82c400 100644 --- a/spec/factories/beispiele.rb +++ b/spec/factories/beispiele.rb @@ -1,10 +1,10 @@ # Read about factories at https://github.com/thoughtbot/factory_girl -FactoryGirl.define do +FactoryBot.define do factory :beispiel do - name "BSP1" - desc "sdf" - datum Date.today + #name "BSP1" + #desc "sdf" + #datum Date.today beispieldatei { Rack::Test::UploadedFile.new(File.join(Rails.root,'public','fetlogo.png'))} end end diff --git a/spec/factories/calendars.rb b/spec/factories/calendars.rb index f9282f8..c2fe5a1 100644 --- a/spec/factories/calendars.rb +++ b/spec/factories/calendars.rb @@ -1,9 +1,9 @@ # Read about factories at https://github.com/thoughtbot/factory_girl -FactoryGirl.define do +FactoryBot.define do factory :calendar do - name "MyString" - public false +# name "MyString" +# public false association :rubrik, factory: :rubrik end end diff --git a/spec/factories/calentries.rb b/spec/factories/calentries.rb index 945d733..e501b3f 100644 --- a/spec/factories/calentries.rb +++ b/spec/factories/calentries.rb @@ -1,11 +1,11 @@ # Read about factories at https://github.com/thoughtbot/factory_girl -FactoryGirl.define do +FactoryBot.define do factory :calentry do - start 1.hours.ago - ende "2013-08-05 21:17:10" - summary "MyString" - typ 1 + start {1.hours.ago} + ende {1.days.from_now } + summary {"MyString"} + typ {1} association :calendar, factory: :calendar end diff --git a/spec/factories/comments.rb b/spec/factories/comments.rb index 3ad06c6..e3d509f 100644 --- a/spec/factories/comments.rb +++ b/spec/factories/comments.rb @@ -1,6 +1,6 @@ # Read about factories at https://github.com/thoughtbot/factory_girl -FactoryGirl.define do +FactoryBot.define do factory :comment do end end diff --git a/spec/factories/crawlobjects.rb b/spec/factories/crawlobjects.rb index a7ca249..cbb7945 100644 --- a/spec/factories/crawlobjects.rb +++ b/spec/factories/crawlobjects.rb @@ -1,20 +1,20 @@ -FactoryGirl.define do +FactoryBot.define do factory :crawlobject do - name "MyString" -text "MyText" -raw "MyText" -type 1 -schematype "MyString" -crawlurl "MyString" -url "" -crawltime "2015-03-30 21:10:29" -published_at "2015-03-30 21:10:29" -referenced "" -parent_id 1 -lft 1 -rgt 1 -depth 1 -children_count 1 + name {'MyString'} + text {'MyText'} + raw {'MyText'} + type {1} + schematype {"MyString"} + crawlurl {"MyString"} + url {""} + crawltime {"2015-03-30 21:10:29"} + published_at {"2015-03-30 21:10:29"} + referenced {""} + parent_id {1} + lft {1} + rgt {1} + depth {1} + children_count {1} end end diff --git a/spec/factories/documents.rb b/spec/factories/documents.rb index e7d4a9c..3333fd5 100644 --- a/spec/factories/documents.rb +++ b/spec/factories/documents.rb @@ -1,10 +1,10 @@ -FactoryGirl.define do +FactoryBot.define do factory :document do - typ 1 -name "MyString" -text "MyText" -etherpadkey "MyString" -parent "" + typ {1} + name {"MyString"} + text {"MyText"} + etherpadkey {"MyString"} + parent {""} end end diff --git a/spec/factories/fetprofiles.rb b/spec/factories/fetprofiles.rb index ec37f92..c0e6454 100644 --- a/spec/factories/fetprofiles.rb +++ b/spec/factories/fetprofiles.rb @@ -1,31 +1,31 @@ # Read about factories at https://github.com/thoughtbot/factory_girl -FactoryGirl.define do +FactoryBot.define do factory :fetprofile do - vorname "MyString" - nachname "MyString" - short "MyString" - fetmailalias "MyString" - desc "MyText" - picture "MyString" - active false - birth_month 4 - birth_day 2 + vorname {'MyString'} + nachname {"MyString"} + short {"MyString"} + fetmailalias {"MyString"} + desc {"MyText"} + picture {"MyString"} + active {false} + birth_month {4} + birth_day {2} factory :fetprofile2 do - vorname "Sarah" - nachname "Nachname2" - short "j" + vorname {"Sarah"} + nachname {"Nachname2"} + short {"j"} end factory :fetprofile3 do - vorname "Thomas" - nachname "Mustermann" + vorname {"Thomas"} + nachname {"Mustermann"} end factory :fetprofile_withadress do - street "some street" - plz "1231" - city "vienna" - telnr "sdf tel nummer" - hdynr "sdf hdy nummer" + street {"some street"} + plz {"1231"} + city {"vienna"} + telnr {"sdf tel nummer"} + hdynr {"sdf hdy nummer"} end end end diff --git a/spec/factories/fetzneditions.rb b/spec/factories/fetzneditions.rb index 13c3de2..b30c8fb 100644 --- a/spec/factories/fetzneditions.rb +++ b/spec/factories/fetzneditions.rb @@ -1,10 +1,10 @@ # Read about factories at https://github.com/thoughtbot/factory_girl -FactoryGirl.define do +FactoryBot.define do factory :fetznedition do - title "MyString" - desc "MyText" - datum "2013-08-19" - datei "MyString" + title {"MyString"} + desc {"MyText"} + datum {"2013-08-19"} + datei {"MyString"} end end diff --git a/spec/factories/fotos.rb b/spec/factories/fotos.rb index f1c80d9..f75a927 100644 --- a/spec/factories/fotos.rb +++ b/spec/factories/fotos.rb @@ -1,10 +1,10 @@ # Read about factories at https://github.com/thoughtbot/factory_girl -FactoryGirl.define do +FactoryBot.define do factory :foto do - title "MyString" - desc "MyText" - gallery_id 1 - datei "MyString" + title {"MyString"} + desc {"MyText"} + gallery_id {1} + datei {"MyString"} end end diff --git a/spec/factories/fragen.rb b/spec/factories/fragen.rb index eedcbcc..0e48367 100644 --- a/spec/factories/fragen.rb +++ b/spec/factories/fragen.rb @@ -1,8 +1,8 @@ # Read about factories at https://github.com/thoughtbot/factory_girl -FactoryGirl.define do +FactoryBot.define do factory :frage do - title "MyString" - text "MyText" + title {"MyString"} + text {"MyText"} end end diff --git a/spec/factories/galleries.rb b/spec/factories/galleries.rb index 48bac09..3a196d8 100644 --- a/spec/factories/galleries.rb +++ b/spec/factories/galleries.rb @@ -1,9 +1,9 @@ # Read about factories at https://github.com/thoughtbot/factory_girl -FactoryGirl.define do +FactoryBot.define do factory :gallery do - name "MyString" - desc "MyText" - datum "2013-08-19" + name {"MyString"} + desc {"MyText"} + datum {"2013-08-19"} end end diff --git a/spec/factories/gremien.rb b/spec/factories/gremien.rb index b85811e..4fdc4ca 100644 --- a/spec/factories/gremien.rb +++ b/spec/factories/gremien.rb @@ -2,10 +2,10 @@ # Read about factories at https://github.com/thoughtbot/factory_girl -FactoryGirl.define do +FactoryBot.define do factory :gremium do - name "Kommission" - desc "Das ist eine Kommission die sich mit irgendwas beschäftigt" - typ 1 + name {"Kommission"} + desc {"Das ist eine Kommission die sich mit irgendwas beschäftigt"} + typ {1} end end diff --git a/spec/factories/keys.rb b/spec/factories/keys.rb index f544a93..ea73cd6 100644 --- a/spec/factories/keys.rb +++ b/spec/factories/keys.rb @@ -1,11 +1,11 @@ -FactoryGirl.define do +FactoryBot.define do factory :key do - uuid "MyString" -expire "2015-06-08 21:32:56" -parent "" -type 1 -user_id 1 -is_valid false + uuid {"MyString"} + expire {"2015-06-08 21:32:56"} +parent {""} +type {1} +user_id {1} +is_valid {false} end end diff --git a/spec/factories/lecturers.rb b/spec/factories/lecturers.rb index 8b261c1..536d123 100644 --- a/spec/factories/lecturers.rb +++ b/spec/factories/lecturers.rb @@ -1,10 +1,10 @@ # Read about factories at https://github.com/thoughtbot/factory_girl -FactoryGirl.define do +FactoryBot.define do factory :lecturer do - name "MyString" - email "MyString" - oid 1 - picture "MyString" + name {"MyString"} + email {"MyString"} + oid {1} + picture {"MyString"} end end diff --git a/spec/factories/lvas.rb b/spec/factories/lvas.rb index 5e9442f..c018122 100644 --- a/spec/factories/lvas.rb +++ b/spec/factories/lvas.rb @@ -1,14 +1,14 @@ # Read about factories at https://github.com/thoughtbot/factory_girl -FactoryGirl.define do +FactoryBot.define do factory :lva do - name "Vorlesung 1" - desc "Das ist eine Vorlesung" - lvanr "001.002" - ects 3 - stunden 2 - pruefungsinformation "sdf" - lernaufwand "sdf" - typ 'VO' + name {"Vorlesung 1"} + desc {"Das ist eine Vorlesung"} + lvanr { "001.002"} + ects {3} + stunden {2} + pruefungsinformation {"sdf"} + lernaufwand {"sdf"} + typ {'VO'} end end diff --git a/spec/factories/meetings.rb b/spec/factories/meetings.rb index 306f158..465e99a 100644 --- a/spec/factories/meetings.rb +++ b/spec/factories/meetings.rb @@ -1,14 +1,14 @@ -FactoryGirl.define do +FactoryBot.define do factory :meeting do - name "MyString" - desc "MyText" - parent nil - intern false - meetingtyp nil + name {"MyString"} + desc {"MyText"} + parent {nil} + intern {false} + meetingtyp {nil} # association :calentry, factory: :calentry after(:build) do |c| - c.calentry=FactoryGirl.build(:calentry, typ: 2) + c.calentry=FactoryBot.build(:calentry, typ: 2) end diff --git a/spec/factories/meetingtyps.rb b/spec/factories/meetingtyps.rb index 319e544..8b213cc 100644 --- a/spec/factories/meetingtyps.rb +++ b/spec/factories/meetingtyps.rb @@ -1,9 +1,9 @@ -FactoryGirl.define do +FactoryBot.define do factory :meetingtyp do - name "MyString" - desc "MyText" - agendaintern false - protocolintern false + name {"MyString"} + desc {"MyText"} + agendaintern {false} + protocolintern {false} association :rubrik, factory: :rubrik end diff --git a/spec/factories/memberships.rb b/spec/factories/memberships.rb index 5a715d1..a10d596 100644 --- a/spec/factories/memberships.rb +++ b/spec/factories/memberships.rb @@ -1,12 +1,12 @@ # Read about factories at https://github.com/thoughtbot/factory_girl -FactoryGirl.define do +FactoryBot.define do factory :membership do - gremium_id 1 - fetprofile_id 1 - start "2013-08-19" - stop "2013-08-23" - typ 1 + gremium_id {1} + fetprofile_id {1} + start {"2013-08-19"} + stop {"2013-08-23"} + typ {1} end end diff --git a/spec/factories/modulgruppen.rb b/spec/factories/modulgruppen.rb index 90946d0..26c3f0e 100644 --- a/spec/factories/modulgruppen.rb +++ b/spec/factories/modulgruppen.rb @@ -1,14 +1,14 @@ # Read about factories at https://github.com/thoughtbot/factory_girl -FactoryGirl.define do +FactoryBot.define do factory :modulgruppe do - typ "Pflicht" - phase 1 - name "Pflichtmodule 1" - desc "ASDFASDF" + typ {"Pflicht"} + phase {1} + name {"Pflichtmodule 1"} + desc {"ASDFASDF"} factory :other_modulgruppe do - name "PFlichtmodule 2" - desc "sdafaswdfsfr" + name {"PFlichtmodule 2"} + desc {"sdafaswdfsfr"} end end diff --git a/spec/factories/moduls.rb b/spec/factories/moduls.rb index 20497fd..bc7cf85 100644 --- a/spec/factories/moduls.rb +++ b/spec/factories/moduls.rb @@ -1,11 +1,11 @@ # Read about factories at https://github.com/thoughtbot/factory_girl -FactoryGirl.define do +FactoryBot.define do factory :modul do - name "" - factory :other_modul do - name "Modul 1" - end + name {""} + factory :other_modul do + name {"Modul 1"} + end end end diff --git a/spec/factories/neuigkeit.rb b/spec/factories/neuigkeit.rb index c984d61..2af4232 100644 --- a/spec/factories/neuigkeit.rb +++ b/spec/factories/neuigkeit.rb @@ -1,10 +1,10 @@ -FactoryGirl.define do +FactoryBot.define do sequence (:title) {|n| "Wichtige Neuigkeit #{n}"} sequence (:text) {|n| "Wichtiger text #{n}"} factory :neuigkeit do title text - datum 1.days.ago + datum {1.days.ago} association :author, factory: :user trait :with_rubrik do @@ -15,14 +15,14 @@ FactoryGirl.define do end trait :with_meeting do after(:build) do |n| - n.meeting=FactoryGirl.build(:meeting, :with_meetingtyp) + n.meeting=FactoryBot.build(:meeting, :with_meetingtyp) end end trait :unpublished do - datum nil + datum {nil} end end diff --git a/spec/factories/nlinks.rb b/spec/factories/nlinks.rb index 9cec3a7..41fd062 100644 --- a/spec/factories/nlinks.rb +++ b/spec/factories/nlinks.rb @@ -1,11 +1,11 @@ # Read about factories at https://github.com/thoughtbot/factory_girl -FactoryGirl.define do +FactoryBot.define do factory :nlink do - title "MyString" - sort 1 - neuigkeit_id 1 - link_id 1 - link_type "MyString" + title {"MyString"} + sort {1} + neuigkeit_id {1} + link_id {1} + link_type {"MyString"} end end diff --git a/spec/factories/rubrik.rb b/spec/factories/rubrik.rb index f1ccdbc..e701dce 100644 --- a/spec/factories/rubrik.rb +++ b/spec/factories/rubrik.rb @@ -1,7 +1,7 @@ -FactoryGirl.define do +FactoryBot.define do factory :rubrik do - name "Allgemeine" - desc "Allgemeine Test News" - public true + name {"Allgemeine"} + desc {"Allgemeine Test News"} + public {true} end end diff --git a/spec/factories/semester_factory.rb b/spec/factories/semester_factory.rb index 7ca0956..946ac40 100644 --- a/spec/factories/semester_factory.rb +++ b/spec/factories/semester_factory.rb @@ -1,15 +1,15 @@ -FactoryGirl.define do +FactoryBot.define do factory :semester do - nummer 2 + nummer {2} factory :zero_semester do - nummer 0 + nummer {0} end factory :first_semester do - nummer 1 + nummer {1} end end end diff --git a/spec/factories/studien.rb b/spec/factories/studien.rb index 9e82de1..5bb6196 100644 --- a/spec/factories/studien.rb +++ b/spec/factories/studien.rb @@ -1,18 +1,18 @@ # Read about factories at https://github.com/thoughtbot/factory_girl -FactoryGirl.define do +FactoryBot.define do factory :studium do - zahl "066506" - name "Automatisierung" - desc "TEST DESC" - typ "Master" + zahl {"066506"} + name {"Automatisierung"} + desc {"TEST DESC"} + typ {"Master"} factory :other_studium do - name "Telecommunication" - desc "frueher Telekommunikation" - zahl "066507" - typ "Master" + name {"Telecommunication"} + desc {"frueher Telekommunikation"} + zahl {"066507"} + typ {"Master"} end end diff --git a/spec/factories/studien.rb~ b/spec/factories/studien.rb~ index 071a60e..cb146bf 100644 --- a/spec/factories/studien.rb~ +++ b/spec/factories/studien.rb~ @@ -1,7 +1,7 @@ # Read about factories at https://github.com/thoughtbot/factory_girl -FactoryGirl.define do +FactoryBot.define do factory :studium do zahl "066.506" name "Automatisierung" diff --git a/spec/factories/survey_answers.rb b/spec/factories/survey_answers.rb index 830266e..9a7c055 100644 --- a/spec/factories/survey_answers.rb +++ b/spec/factories/survey_answers.rb @@ -1,7 +1,7 @@ -FactoryGirl.define do +FactoryBot.define do factory :survey_answer, :class => 'Survey::Answer' do - choice nil -user nil + choice {nil} + user {nil} end end diff --git a/spec/factories/survey_choices.rb b/spec/factories/survey_choices.rb index 0b5d6a6..9159898 100644 --- a/spec/factories/survey_choices.rb +++ b/spec/factories/survey_choices.rb @@ -1,9 +1,9 @@ -FactoryGirl.define do +FactoryBot.define do factory :survey_choice, :class => 'Survey::Choice' do - text "MyString" -question nil -sort 1 -picture "MyString" + text {"MyString"} +question {nil} +sort {1} +picture {"MyString"} end end diff --git a/spec/factories/survey_questions.rb b/spec/factories/survey_questions.rb index df8268e..2f6fab3 100644 --- a/spec/factories/survey_questions.rb +++ b/spec/factories/survey_questions.rb @@ -1,8 +1,8 @@ -FactoryGirl.define do +FactoryBot.define do factory :survey_question, :class => 'Survey::Question' do - title "MyString" -text "MyText" -typ 1 + title {"MyString"} + text {"MyText"} + typ {1} end end diff --git a/spec/factories/themen.rb b/spec/factories/themen.rb index 30c74c4..edca417 100644 --- a/spec/factories/themen.rb +++ b/spec/factories/themen.rb @@ -1,8 +1,8 @@ # Read about factories at https://github.com/thoughtbot/factory_girl -FactoryGirl.define do +FactoryBot.define do factory :thema do - title "MyString" - text "MyText" + title {"MyString"} + text {"MyText"} end end diff --git a/spec/factories/themengruppen.rb b/spec/factories/themengruppen.rb index 5a4f413..c8ffc9b 100644 --- a/spec/factories/themengruppen.rb +++ b/spec/factories/themengruppen.rb @@ -1,8 +1,8 @@ # Read about factories at https://github.com/thoughtbot/factory_girl -FactoryGirl.define do +FactoryBot.define do factory :themengruppe, :class => 'Themengruppe' do - title "MyString" - text "MyText" + title {"MyString"} + text {"MyText"} end end diff --git a/spec/factories/users.rb b/spec/factories/users.rb index 63af806..e0cb339 100644 --- a/spec/factories/users.rb +++ b/spec/factories/users.rb @@ -1,11 +1,11 @@ -FactoryGirl.define do +FactoryBot.define do sequence (:email) {|n| "testuser#{n}@fet.at"} factory :user do email - password "password" - password_confirmation "password" + password {"password"} + password_confirmation {"password"} factory :other_user do - email "othertest@test.at" + email {"othertest@test.at"} end trait :fetuser do after(:create) do |user| diff --git a/spec/features/admin_spec.rb b/spec/features/admin_spec.rb index 02f0d11..6759bdf 100644 --- a/spec/features/admin_spec.rb +++ b/spec/features/admin_spec.rb @@ -5,15 +5,15 @@ Capybara.add_selector(:href) do end feature 'Administration', :type=> :feature do - let!(:user) {FactoryGirl.create(:user)} - let!(:rubrik) {FactoryGirl.create(:rubrik)} + let!(:user) {FactoryBot.create(:user)} + let!(:rubrik) {FactoryBot.create(:rubrik)} - let!(:themengruppe){ FactoryGirl.create(:themengruppe) } - let!(:studium) {FactoryGirl.create(:studium,:visible=>true)} + let!(:themengruppe){ FactoryBot.create(:themengruppe) } + let!(:studium) {FactoryBot.create(:studium,:visible=>true)} before(:each) do - FactoryGirl.create(:neuigkeit, rubrik_id: rubrik.id, author_id: user.id) - FactoryGirl.create(:thema, id: t=YAML.load_file("#{::Rails.root.to_s}/config/start_topic.yml").to_i, themengruppe_id: themengruppe.id) + FactoryBot.create(:neuigkeit, rubrik_id: rubrik.id, author_id: user.id) + FactoryBot.create(:thema, id: t=YAML.load_file("#{::Rails.root.to_s}/config/start_topic.yml").to_i, themengruppe_id: themengruppe.id) studium.id end def sign_in diff --git a/spec/features/beispielsammlung_spec.rb b/spec/features/beispielsammlung_spec.rb index 96864e6..b0441fc 100644 --- a/spec/features/beispielsammlung_spec.rb +++ b/spec/features/beispielsammlung_spec.rb @@ -4,13 +4,13 @@ Capybara.add_selector(:href) do xpath {|href| XPath.descendant[XPath.attr(:href).contains(href)] } end feature 'Beispielsammlung', :type=>:feature do - let!(:rubrik) {FactoryGirl.create(:rubrik)} - let!(:user) {FactoryGirl.create(:user)} - let!(:themengruppe){ FactoryGirl.create(:themengruppe) } - let!(:studium) {FactoryGirl.create(:studium,:visible=>true)} + let!(:rubrik) {FactoryBot.create(:rubrik)} + let!(:user) {FactoryBot.create(:user)} + let!(:themengruppe){ FactoryBot.create(:themengruppe) } + let!(:studium) {FactoryBot.create(:studium,:visible=>true)} before(:each) do - FactoryGirl.create(:neuigkeit, rubrik_id: rubrik.id, author_id: user.id) - FactoryGirl.create(:thema, id: t=YAML.load_file("#{::Rails.root.to_s}/config/start_topic.yml").to_i, themengruppe_id: themengruppe.id) + FactoryBot.create(:neuigkeit, rubrik_id: rubrik.id, author_id: user.id) + FactoryBot.create(:thema, id: t=YAML.load_file("#{::Rails.root.to_s}/config/start_topic.yml").to_i, themengruppe_id: themengruppe.id) studium.id end scenario 'login' do diff --git a/spec/mailers/news_mailer_spec.rb b/spec/mailers/news_mailer_spec.rb index a123f83..fd7fc50 100644 --- a/spec/mailers/news_mailer_spec.rb +++ b/spec/mailers/news_mailer_spec.rb @@ -6,11 +6,11 @@ include Rails.application.routes.url_helpers describe 'neuigkeit_mail' do before(:each) do - rubrik = FactoryGirl.create(:rubrik) - @neuigkeit=FactoryGirl.create(:neuigkeit, author_id: user.id, rubrik_id: rubrik.id) + rubrik = FactoryBot.create(:rubrik) + @neuigkeit=FactoryBot.create(:neuigkeit, author_id: user.id, rubrik_id: rubrik.id) NewsMailer.stub(:default_url_options).and_return({host:"localhost", port: 3000}) end - let(:user) {User.first || FactoryGirl.create(:user)} + let(:user) {User.first || FactoryBot.create(:user)} let(:email) {"test@mail.com"} let(:neuigkeit) {@neuigkeit} diff --git a/spec/models/attachment_spec.rb b/spec/models/attachment_spec.rb index 42c878e..debdf39 100644 --- a/spec/models/attachment_spec.rb +++ b/spec/models/attachment_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' describe Attachment do pending "add some examples to (or delete) #{__FILE__}" - let(:attachment) {FactoryGirl.build_stubbed(:attachment)} + let(:attachment) {FactoryBot.build_stubbed(:attachment)} it "responds to image" do expect(attachment.respond_to?(:image?)).to be true end diff --git a/spec/models/beispiel_spec.rb b/spec/models/beispiel_spec.rb index 171456e..38de30f 100644 --- a/spec/models/beispiel_spec.rb +++ b/spec/models/beispiel_spec.rb @@ -3,25 +3,25 @@ require 'spec_helper' describe Beispiel, :type=>:model do let_studium_lva # before(:each) do -# s=FactoryGirl.create(:studium) -# mg=FactoryGirl.create(:modulgruppe, studium_id: s.id)# +# s=FactoryBot.create(:studium) +# mg=FactoryBot.create(:modulgruppe, studium_id: s.id)# -# m=FactoryGirl.build(:other_modul) +# m=FactoryBot.build(:other_modul) # m.modulgruppen << mg # m.save! -# @l=FactoryGirl.build(:lva) +# @l=FactoryBot.build(:lva) # @l.modul << m # @l.save! # end - let(:lva){FactoryGirl.build_stubbed(:lva)} - let(:beispiel){FactoryGirl.build(:beispiel, lva: lva)} + let(:lva){FactoryBot.build_stubbed(:lva)} + let(:beispiel){FactoryBot.build(:beispiel, lva: lva)} it "should be created" do expect{beispiel.save!; Sunspot.commit}.to change{Beispiel.count}.by(1) end it "is not valid without lva" do - b=FactoryGirl.build(:beispiel) + b=FactoryBot.build(:beispiel) expect(b.valid?).to be false end it "responds to comments" do diff --git a/spec/models/calendar_spec.rb b/spec/models/calendar_spec.rb index 23edb34..6f4260b 100644 --- a/spec/models/calendar_spec.rb +++ b/spec/models/calendar_spec.rb @@ -2,8 +2,8 @@ require 'spec_helper' describe Calendar do pending "add some examples to (or delete) #{__FILE__}" - let(:rubrik) {FactoryGirl.create(:rubrik)} - let(:calendar) {FactoryGirl.build(:calendar, rubrik_id: rubrik.id)} + let(:rubrik) {FactoryBot.create(:rubrik)} + let(:calendar) {FactoryBot.build(:calendar, rubrik_id: rubrik.id)} it "should be valid" do expect(calendar).to be_valid end diff --git a/spec/models/calentry_spec.rb b/spec/models/calentry_spec.rb index 6420e6f..a170ce5 100644 --- a/spec/models/calentry_spec.rb +++ b/spec/models/calentry_spec.rb @@ -2,11 +2,11 @@ require 'spec_helper' describe Calentry do - let(:rubrik) {FactoryGirl.create(:rubrik)} - let(:user) {FactoryGirl.create(:user)} - let(:calendar) {FactoryGirl.create(:calendar,updated_at: 1.hour.ago)} - let(:neuigkeit) {FactoryGirl.create(:neuigkeit, rubrik_id: rubrik.id, author_id: user.id, updated_at: 1.hour.ago)} - subject(:calentry) {FactoryGirl.build(:calentry, calendar_id: calendar.id, object_type: "Neuigkeit",object_id: neuigkeit.id)} + let(:rubrik) {FactoryBot.create(:rubrik)} + let(:user) {FactoryBot.create(:user)} + let(:calendar) {FactoryBot.create(:calendar,updated_at: 1.hour.ago)} + let(:neuigkeit) {FactoryBot.create(:neuigkeit, rubrik_id: rubrik.id, author_id: user.id, updated_at: 1.hour.ago)} + subject(:calentry) {FactoryBot.build(:calentry, calendar_id: calendar.id, object_type: "Neuigkeit",object_id: neuigkeit.id)} it "is valid with full data" do expect(calentry).to be_valid @@ -14,7 +14,7 @@ describe Calentry do [:ende,:start,:typ].each do |attr| it "is not valid without #{attr}" do - e= FactoryGirl.build(:calentry, calendar_id: calendar.id, object_type: "Neuigkeit",object_id: neuigkeit.id, attr => nil) + e= FactoryBot.build(:calentry, calendar_id: calendar.id, object_type: "Neuigkeit",object_id: neuigkeit.id, attr => nil) expect(e).not_to be_valid expect(e).to have_at_least(1).errors_on(attr) end diff --git a/spec/models/fetprofile_spec.rb b/spec/models/fetprofile_spec.rb index 73d44af..2eb6359 100644 --- a/spec/models/fetprofile_spec.rb +++ b/spec/models/fetprofile_spec.rb @@ -3,22 +3,22 @@ require 'spec_helper' describe Fetprofile do [:vorname,:nachname].each do |attr| it "should not be valid without #{attr}" do - fp = FactoryGirl.build(:fetprofile) + fp = FactoryBot.build(:fetprofile) fp.send("#{attr}=".to_sym,nil) fp.should_not be_valid end end it "should be created" do - fp=Fetprofile.new(FactoryGirl.attributes_for(:fetprofile)) + fp=Fetprofile.new(FactoryBot.attributes_for(:fetprofile)) expect(fp.save).to be true end it "should be valid" do - fp = FactoryGirl.build(:fetprofile) + fp = FactoryBot.build(:fetprofile) fp.should be_valid end it "should not be valid with short name" do - fp = FactoryGirl.build(:fetprofile) + fp = FactoryBot.build(:fetprofile) fp.nachname ="S" fp.should_not be_valid fp.vorname ="d" diff --git a/spec/models/gremium_spec.rb b/spec/models/gremium_spec.rb index 786c9a2..8ba7689 100644 --- a/spec/models/gremium_spec.rb +++ b/spec/models/gremium_spec.rb @@ -1,13 +1,13 @@ require 'spec_helper' describe Gremium do - let(:gremium) {FactoryGirl.build(:gremium)} + let(:gremium) {FactoryBot.build(:gremium)} let(:object_variable){gremium} it_behaves_like "a valid object" [:name,:typ].each do |attr| it "is not valid without #{attr}" do - g = FactoryGirl.build(:gremium,attr.to_sym => nil) + g = FactoryBot.build(:gremium,attr.to_sym => nil) expect(g).not_to be_valid expect(g.errors[attr]).to have_at_least(1).items end @@ -18,33 +18,33 @@ describe Gremium do it "is not valid with wrong typ" do ((-5..30).to_a-Gremium::TYPEN.keys()).each do |i| - g = FactoryGirl.build(:gremium, typ: i) + g = FactoryBot.build(:gremium, typ: i) expect(g).not_to be_valid end end it "is in tabs if typ is 1" do - g = FactoryGirl.create(:gremium, typ: 1) + g = FactoryBot.create(:gremium, typ: 1) expect(Gremium.tabs).to eq([g]) end it "is not in tabs if typ is not 1 or 3" do - g = FactoryGirl.create(:gremium, typ: 2) + g = FactoryBot.create(:gremium, typ: 2) expect(Gremium.tabs).to eq([]) end it "destroys memberships if its destroyed" do - g=FactoryGirl.create(:gremium) - fp=FactoryGirl.create(:fetprofile) - m=FactoryGirl.create(:membership, gremium_id: g.id, fetprofile_id: fp.id) + g=FactoryBot.create(:gremium) + fp=FactoryBot.create(:fetprofile) + m=FactoryBot.create(:membership, gremium_id: g.id, fetprofile_id: fp.id) expect{g.destroy}.to change {Membership.count}.by(-1) end it "responds to title" do - g=FactoryGirl.build(:gremium) + g=FactoryBot.build(:gremium) expect(g.respond_to?(:title)).to be true end end diff --git a/spec/models/lva_spec.rb b/spec/models/lva_spec.rb index 5f395a6..065dc24 100644 --- a/spec/models/lva_spec.rb +++ b/spec/models/lva_spec.rb @@ -51,7 +51,7 @@ describe Lva, :type=>:model do end describe "if bare" do - let(:lva) {FactoryGirl.build(:lva)} + let(:lva) {FactoryBot.build(:lva)} it "should be created" do l=lva l.modul << modul diff --git a/spec/models/meeting_spec.rb b/spec/models/meeting_spec.rb index 6aa23c2..14d13ac 100644 --- a/spec/models/meeting_spec.rb +++ b/spec/models/meeting_spec.rb @@ -1,12 +1,12 @@ require 'spec_helper' RSpec.describe Meeting, :type => :model do - let(:user){FactoryGirl.create(:user)} - let(:rubrik) {FactoryGirl.create(:rubrik)} - let(:calendar){FactoryGirl.create(:calendar, rubrik_id: rubrik.id)} - let(:calentry){FactoryGirl.build(:calentry, calendar_id: calendar.id, typ: 2)} - let(:meetingtyp){FactoryGirl.create(:meetingtyp, rubrik_id: rubrik.id)} - let(:meeting){FactoryGirl.build(:meeting, meetingtyp_id: meetingtyp.id)} + let(:user){FactoryBot.create(:user)} + let(:rubrik) {FactoryBot.create(:rubrik)} + let(:calendar){FactoryBot.create(:calendar, rubrik_id: rubrik.id)} + let(:calentry){FactoryBot.build(:calentry, calendar_id: calendar.id, typ: 2)} + let(:meetingtyp){FactoryBot.create(:meetingtyp, rubrik_id: rubrik.id)} + let(:meeting){FactoryBot.build(:meeting, meetingtyp_id: meetingtyp.id)} let(:object_variable) {meeting} it_behaves_like "a valid object" @@ -27,7 +27,7 @@ RSpec.describe Meeting, :type => :model do expect(meeting).to be_valid end context "without calentry" do -# let(:meeting){FactoryGirl.build(:meeting, :without_calentry, meetingtyp_id: meetingtyp.id)} +# let(:meeting){FactoryBot.build(:meeting, :without_calentry, meetingtyp_id: meetingtyp.id)} it "should be creating a calentry typ 2" do meeting.create_calentry diff --git a/spec/models/meetingtyp_spec.rb b/spec/models/meetingtyp_spec.rb index ff7afdc..a608594 100644 --- a/spec/models/meetingtyp_spec.rb +++ b/spec/models/meetingtyp_spec.rb @@ -2,8 +2,8 @@ require 'spec_helper' RSpec.describe Meetingtyp, :type => :model do pending "add some examples to (or delete) #{__FILE__}" - let(:rubrik) {FactoryGirl.create(:rubrik)} - let(:meetingtyp){FactoryGirl.build(:meetingtyp, rubrik_id: rubrik.id)} + let(:rubrik) {FactoryBot.create(:rubrik)} + let(:meetingtyp){FactoryBot.build(:meetingtyp, rubrik_id: rubrik.id)} it "should be created" do expect(meetingtyp).to be_valid expect(meetingtyp.save).to be true diff --git a/spec/models/modul_spec.rb b/spec/models/modul_spec.rb index 262b8dd..b888b63 100644 --- a/spec/models/modul_spec.rb +++ b/spec/models/modul_spec.rb @@ -3,14 +3,14 @@ require 'spec_helper' describe Modul do [:name].each do |attr| it "should not be valid without #{attr}" do - modul = FactoryGirl.build(:modul) + modul = FactoryBot.build(:modul) modul.send("#{attr}=".to_sym,nil) expect(modul).not_to be_valid expect(modul).to have_at_least(1).errors_on(attr) end end it "is valid with everything" do - m = FactoryGirl.build(:modul) + m = FactoryBot.build(:modul) expect(m).to be_valid end end diff --git a/spec/models/modulgruppe_spec.rb b/spec/models/modulgruppe_spec.rb index d06d7bf..63e1521 100644 --- a/spec/models/modulgruppe_spec.rb +++ b/spec/models/modulgruppe_spec.rb @@ -2,42 +2,42 @@ require 'spec_helper' describe Modulgruppe, :type =>:model do it "should not be valid without studium" do - mg=FactoryGirl.build(:modulgruppe) + mg=FactoryBot.build(:modulgruppe) mg.should_not be_valid mg.should have(1).errors_on(:studium_id) end it "should be valid with studium" do - s=FactoryGirl.create(:studium) - mg=FactoryGirl.build(:modulgruppe) + s=FactoryBot.create(:studium) + mg=FactoryBot.build(:modulgruppe) mg.studium=s mg.should be_valid end it "should not be valid without name" do - s=FactoryGirl.create(:studium) - mg=FactoryGirl.build(:modulgruppe) + s=FactoryBot.create(:studium) + mg=FactoryBot.build(:modulgruppe) mg.studium=s mg.name=nil mg.should_not be_valid mg.should have_at_least(1).errors_on(:name) end xit "should not be valid with dubble name" do - s=FactoryGirl.create(:studium) - mg=FactoryGirl.build(:modulgruppe, name: "Gruppe 1", desc: "132") + s=FactoryBot.create(:studium) + mg=FactoryBot.build(:modulgruppe, name: "Gruppe 1", desc: "132") mg.studium=s mg.save - mg=FactoryGirl.build(:modulgruppe, name: "Gruppe 2", desc: "133") + mg=FactoryBot.build(:modulgruppe, name: "Gruppe 2", desc: "133") mg.studium=s mg.should_not be_valid mg.should have_at_least(1).errors_on(:name) end it "should be valid with same name on different studien" do - s=FactoryGirl.create(:studium) - s2=FactoryGirl.create(:other_studium) - mg=FactoryGirl.build(:modulgruppe, name: "Gruppe") + s=FactoryBot.create(:studium) + s2=FactoryBot.create(:other_studium) + mg=FactoryBot.build(:modulgruppe, name: "Gruppe") mg.studium=s mg.save - mg=FactoryGirl.build(:other_modulgruppe, name: "Gruppe") + mg=FactoryBot.build(:other_modulgruppe, name: "Gruppe") mg.studium=s2 mg.should be_valid diff --git a/spec/models/neuigkeit_spec.rb b/spec/models/neuigkeit_spec.rb index 7e60b94..e40b1a1 100644 --- a/spec/models/neuigkeit_spec.rb +++ b/spec/models/neuigkeit_spec.rb @@ -2,13 +2,13 @@ require 'spec_helper' describe Neuigkeit do - let(:neuigkeit) {(FactoryGirl.build(:neuigkeit, :with_rubrik))} - let(:intern_neuigkeit) {FactoryGirl.build(:neuigkeit, :with_intern_rubrik)} - let(:unpublished_neuigkeit){FactoryGirl.build(:neuigkeit, :unpublished,:with_rubrik)} - let(:attachment) {FactoryGirl.build_stubbed(:attachment)} + let(:neuigkeit) {(FactoryBot.build(:neuigkeit, :with_rubrik))} + let(:intern_neuigkeit) {FactoryBot.build(:neuigkeit, :with_intern_rubrik)} + let(:unpublished_neuigkeit){FactoryBot.build(:neuigkeit, :unpublished,:with_rubrik)} + let(:attachment) {FactoryBot.build_stubbed(:attachment)} let(:calentry) { - FactoryGirl.build(:calentry, start: 1.hour.ago, ende: 5.minutes.ago) + FactoryBot.build(:calentry, start: 1.hour.ago, ende: 5.minutes.ago) } let(:object_variable) {neuigkeit} @@ -40,7 +40,7 @@ describe Neuigkeit do end context "with meeting" do - let(:neuigkeit) {(FactoryGirl.build(:neuigkeit, :with_rubrik, :with_meeting))} + let(:neuigkeit) {(FactoryBot.build(:neuigkeit, :with_rubrik, :with_meeting))} let(:object_variable) {neuigkeit} it_behaves_like "a valid object" it "has meeting" do expect(neuigkeit.meeting).to be_truthy end diff --git a/spec/models/rubrik_spec.rb b/spec/models/rubrik_spec.rb index 9f2040a..213a16b 100644 --- a/spec/models/rubrik_spec.rb +++ b/spec/models/rubrik_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' describe Rubrik do pending "add some examples to (or delete) #{__FILE__}" - let(:rubrik){FactoryGirl.create(:rubrik)} + let(:rubrik){FactoryBot.create(:rubrik)} it "should be valid" do expect(rubrik).to be_valid end diff --git a/spec/models/studium_spec.rb b/spec/models/studium_spec.rb index 5abc5d0..8c6529f 100644 --- a/spec/models/studium_spec.rb +++ b/spec/models/studium_spec.rb @@ -2,12 +2,12 @@ require 'spec_helper' describe Studium do # test if it is invalid if certain attributes are missing - let(:studium) { FactoryGirl.build(:studium)} + let(:studium) { FactoryBot.build(:studium)} let(:object_variable) {studium} [:name, :zahl].each do |attr| it "should not be valid without #{attr}" do - s = FactoryGirl.build(:studium, attr=>nil) + s = FactoryBot.build(:studium, attr=>nil) expect(s).not_to be_valid end end @@ -15,12 +15,12 @@ describe Studium do it_behaves_like "a valid object" it "should create studium with valid data" do - s=FactoryGirl.build(:studium) + s=FactoryBot.build(:studium) lambda { s.save!; Sunspot.commit}.should change {Studium.count()}.by(1) end it "should not accept double entrys" do - FactoryGirl.create(:studium) + FactoryBot.create(:studium) expect(studium).not_to be_valid @@ -28,14 +28,14 @@ describe Studium do expect(studium).to have_at_least(1).error_on(:zahl) end it "expect zahl to be 000.000" do - s=FactoryGirl.build(:studium, :zahl=>"000.000") + s=FactoryBot.build(:studium, :zahl=>"000.000") #Sunspot.commit s.should_not be_valid expect(s.errors.size).to be > 0 end it "is not valid with a short zahl" do - s=FactoryGirl.build(:studium, :zahl=>"123") + s=FactoryBot.build(:studium, :zahl=>"123") expect(s).not_to be_valid end diff --git a/spec/models/thema_spec.rb b/spec/models/thema_spec.rb index 6bcdc81..6101930 100644 --- a/spec/models/thema_spec.rb +++ b/spec/models/thema_spec.rb @@ -4,15 +4,15 @@ describe Thema do [:text, :title].each do |attr| it "should not be valid without #{attr}" do - tg=FactoryGirl.build(:themengruppe) - t = FactoryGirl.build(:thema, attr=>nil) + tg=FactoryBot.build(:themengruppe) + t = FactoryBot.build(:thema, attr=>nil) t.themengruppe=tg t.should_not be_valid end end it "should not be valid without Themengruppe" do - tg=FactoryGirl.build(:themengruppe) - t = FactoryGirl.build(:thema) + tg=FactoryBot.build(:themengruppe) + t = FactoryBot.build(:thema) t.should_not be_valid end diff --git a/spec/models/themengruppe_spec.rb b/spec/models/themengruppe_spec.rb index d504f19..8b02f84 100644 --- a/spec/models/themengruppe_spec.rb +++ b/spec/models/themengruppe_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' describe Themengruppe do [:text, :title].each do |attr| it "should not be valid without #{attr}" do - tg=FactoryGirl.build(:themengruppe, attr=>nil) + tg=FactoryBot.build(:themengruppe, attr=>nil) tg.should_not be_valid end end diff --git a/spec/support/controller_macros.rb b/spec/support/controller_macros.rb index d7ebb81..d4b07d3 100644 --- a/spec/support/controller_macros.rb +++ b/spec/support/controller_macros.rb @@ -2,7 +2,7 @@ module ControllerMacros # include Devise::TestHelpers, :type=>:controller def with_fet_user - let(:fet_user) {FactoryGirl.create(:other_user, :fetuser)} + let(:fet_user) {FactoryBot.create(:other_user, :fetuser)} before(:each) do allow(@controller).to receive(:current_user).and_return(fet_user) @@ -12,7 +12,7 @@ module ControllerMacros def with_fet_admin let(:fet_user)do - fet_user=FactoryGirl.create(:other_user) + fet_user=FactoryBot.create(:other_user) fet_user.add_role("fetadmin") fet_user end @@ -25,7 +25,7 @@ module ControllerMacros def login_fet_user before(:each) do @request.env["devise.mapping"] = Devise.mappings[:user] - user = FactoryGirl.build(:other_user) + user = FactoryBot.build(:other_user) user = User.find_by_email(user.email) || user user.save user.add_role(:fetuser) @@ -36,7 +36,7 @@ module ControllerMacros def login_user before(:each) do @request.env["devise.mapping"] = Devise.mappings[:user] - user = FactoryGirl.build(:other_user) + user = FactoryBot.build(:other_user) user = User.find_by_email(user.email) || user user.save # user.confirm! diff --git a/spec/support/model_macros.rb b/spec/support/model_macros.rb index 7b7dd77..327602c 100644 --- a/spec/support/model_macros.rb +++ b/spec/support/model_macros.rb @@ -1,18 +1,18 @@ module ModelMacros def let_studium_lva - let(:studium) {FactoryGirl.create(:studium)} + let(:studium) {FactoryBot.create(:studium)} - let(:zerosemester) {FactoryGirl.create(:zero_semester,studium_id: studium.id)} - let(:firstsemester) {FactoryGirl.create(:first_semester)} - let(:modulgruppe){FactoryGirl.create(:modulgruppe,studium_id: studium.id)} + let(:zerosemester) {FactoryBot.create(:zero_semester,studium_id: studium.id)} + let(:firstsemester) {FactoryBot.create(:first_semester)} + let(:modulgruppe){FactoryBot.create(:modulgruppe,studium_id: studium.id)} let(:modul) do - m=FactoryGirl.build(:other_modul) + m=FactoryBot.build(:other_modul) m.modulgruppen << modulgruppe m.save! m end let(:lva) do - l=FactoryGirl.build(:lva) + l=FactoryBot.build(:lva) l.modul << modul l end diff --git a/spec/support/view_macros.rb b/spec/support/view_macros.rb index ad0d3d2..0d8be34 100644 --- a/spec/support/view_macros.rb +++ b/spec/support/view_macros.rb @@ -14,7 +14,7 @@ module ViewMacros def login_fet_user before(:each) do @request.env["devise.mapping"] = Devise.mappings[:user] - user = FactoryGirl.build(:user) + user = FactoryBot.build(:user) user = User.find_by_email(user.email) || user user.save user.add_role(:fetuser) @@ -29,7 +29,7 @@ module ViewMacros def login_fetadmin_user before(:each) do @request.env["devise.mapping"] = Devise.mappings[:user] - user = FactoryGirl.build(:user) + user = FactoryBot.build(:user) user = User.find_by_email(user.email) || user user.save user.add_role(:fetadmin) diff --git a/spec/views/fetprofiles/edit.html.erb_spec.rb b/spec/views/fetprofiles/edit.html.erb_spec.rb index 8efc992..c155c3d 100644 --- a/spec/views/fetprofiles/edit.html.erb_spec.rb +++ b/spec/views/fetprofiles/edit.html.erb_spec.rb @@ -4,7 +4,7 @@ describe "fetprofiles/edit", :type=> :view do foreach_theme do login_fet_user before(:each) do - @fetprofile = FactoryGirl.create(:fetprofile_withadress,:skype => "myskypename") + @fetprofile = FactoryBot.create(:fetprofile_withadress,:skype => "myskypename") @memberships = [] end diff --git a/spec/views/fetprofiles/fetprofile.html.erb_spec.rb b/spec/views/fetprofiles/fetprofile.html.erb_spec.rb index 12c992f..64f8a53 100644 --- a/spec/views/fetprofiles/fetprofile.html.erb_spec.rb +++ b/spec/views/fetprofiles/fetprofile.html.erb_spec.rb @@ -6,9 +6,9 @@ include Devise::TestHelpers include Rails.application.routes.url_helpers before(:each) do # @fetprofile = - #assign(:fetprofile, stub_model(Fetprofile, FactoryGirl.attributes_for(:fetprofile))) + #assign(:fetprofile, stub_model(Fetprofile, FactoryBot.attributes_for(:fetprofile))) default_url_options[:locale] = :de - @fetprofile = FactoryGirl.create(:fetprofile) + @fetprofile = FactoryBot.create(:fetprofile) # assign(:fetprofile,@fetprofile) # assign(:memberships, []) end diff --git a/spec/views/fetprofiles/index.html.erb_spec.rb b/spec/views/fetprofiles/index.html.erb_spec.rb index c0ca1ad..46f1678 100644 --- a/spec/views/fetprofiles/index.html.erb_spec.rb +++ b/spec/views/fetprofiles/index.html.erb_spec.rb @@ -5,10 +5,10 @@ describe "fetprofiles/index" , :type=>:view do foreach_theme do before(:each) do # default_url_options[:locale] = :de - @fetprofile1 = FactoryGirl.create(:fetprofile) - @fetprofile2 = FactoryGirl.create(:fetprofile2) - @fetprofile3 = FactoryGirl.create(:fetprofile3) - @fetprofile4 = FactoryGirl.create(:fetprofile_withadress) + @fetprofile1 = FactoryBot.create(:fetprofile) + @fetprofile2 = FactoryBot.create(:fetprofile2) + @fetprofile3 = FactoryBot.create(:fetprofile3) + @fetprofile4 = FactoryBot.create(:fetprofile_withadress) @fetprofiles=[@fetprofile1, @fetprofile2, @fetprofile3, @fetprofile4] assign(:fetprofiles,@fetprofiles) assign(:gremientabs, []) diff --git a/spec/views/fetprofiles/new.html.erb_spec.rb b/spec/views/fetprofiles/new.html.erb_spec.rb index 5202ff4..488f9ac 100644 --- a/spec/views/fetprofiles/new.html.erb_spec.rb +++ b/spec/views/fetprofiles/new.html.erb_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' describe "fetprofiles/new", :type=> :view do foreach_theme do before(:each) do - @fetprofile = FactoryGirl.create(:fetprofile_withadress,:skype => "myskypename") + @fetprofile = FactoryBot.create(:fetprofile_withadress,:skype => "myskypename") @memberships = [] end diff --git a/spec/views/fetprofiles/show.html.erb_spec.rb b/spec/views/fetprofiles/show.html.erb_spec.rb index 43f183f..cd747fd 100644 --- a/spec/views/fetprofiles/show.html.erb_spec.rb +++ b/spec/views/fetprofiles/show.html.erb_spec.rb @@ -5,13 +5,13 @@ describe "fetprofiles/show", :type => :view do before(:each) do default_url_options[:locale] = :de - @fetprofile = FactoryGirl.create(:fetprofile_withadress) + @fetprofile = FactoryBot.create(:fetprofile_withadress) assign(:fetprofile,@fetprofile) - @gremium = FactoryGirl.create(:gremium) - @gremium2 = FactoryGirl.create(:gremium, name:"Kommission2") - @gremium3 = FactoryGirl.create(:gremium, name:"Kommission3", typ: 2) + @gremium = FactoryBot.create(:gremium) + @gremium2 = FactoryBot.create(:gremium, name:"Kommission2") + @gremium3 = FactoryBot.create(:gremium, name:"Kommission3", typ: 2) - assign(:memberships, [FactoryGirl.create(:membership,gremium_id: @gremium.id, fetprofile_id: @fetprofile.id)]) + assign(:memberships, [FactoryBot.create(:membership,gremium_id: @gremium.id, fetprofile_id: @fetprofile.id)]) assign(:gremientabs, [@gremium2]) # view.theme "blue2" end