gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rubocop files update and auto correction

Browse source
This commit is contained in:
raluka 2015-10-21 17:33:53 +02:00
parent 1a62dc930e
commit 1f82fbbdc6
88 changed files with 519 additions and 452 deletions
Download patch file Download diff file Expand all files Collapse all files

17
.rubocop.yml
View file

@ -25,8 +25,15 @@ Style/EmptyLinesAroundAccessModifier:
Enabled: true
# Do not insert empty line after class definition and before closing class
Style/EmptyLinesAroundBody:
Enabled: true
Style/EmptyLinesAroundBlockBody:
EnforcedStyle: no_empty_lines
Style/EmptyLinesAroundClassBody:
EnforcedStyle: no_empty_lines
Style/EmptyLinesAroundModuleBody:
EnforcedStyle: no_empty_lines
# Use hash literal {} instead of Hash.new
Style/EmptyLiteral:
@ -93,12 +100,12 @@ Style/AndOr:
Enabled: true
# avoid deep blocks nesting
Style/BlockNesting:
Metrics/BlockNesting:
Max: 4
# use do instead of {...} in multiline blocks
Style/Blocks:
Enabled: true
Style/BlockDelimiters:
EnforcedStyle: line_count_based
# avoid redundunt curly braces when it is obvious that hash is used
Style/BracesAroundHashParameters:

398
.rubocop_todo.yml
View file

@ -1,218 +1,359 @@
# This configuration was generated by `rubocop --auto-gen-config`
# on 2014-07-21 12:48:09 +0200 using RuboCop version 0.24.1.
# This configuration was generated by
# `rubocop --auto-gen-config`
# on 2015-10-22 14:30:43 +0200 using RuboCop version 0.34.2.
# The point is for the user to remove these configuration records
# one by one as the offenses are removed from the code base.
# Note that changes in the inspected code, or installation of new
# versions of RuboCop, may require this file to be generated again.
# Offense count: 3
# Offense count: 2
Lint/DuplicatedKey:
Exclude:
- 'db/migrate/20140801164901_move_conference_media_to_commercial.rb'
- 'db/migrate/20140801170430_move_event_media_to_commercial.rb'
# Offense count: 83
Metrics/AbcSize:
Max: 73
# Offense count: 6
# Configuration parameters: CountComments.
Metrics/ClassLength:
Max: 200
# Offense count: 9
Metrics/CyclomaticComplexity:
Max: 12
# Offense count: 863
# Configuration parameters: AllowURI, URISchemes.
Metrics/LineLength:
Max: 207
# Offense count: 87
# Configuration parameters: CountComments.
Metrics/MethodLength:
Max: 56
# Offense count: 1
# Configuration parameters: CountComments.
Metrics/ModuleLength:
Max: 243
# Offense count: 5
Metrics/PerceivedComplexity:
Max: 15
# Offense count: 18
Style/AccessorMethodName:
Exclude:
- 'app/controllers/admin/events_controller.rb'
- 'app/controllers/application_controller.rb'
- 'app/models/campaign.rb'
- 'app/models/conference.rb'
- 'app/models/target.rb'
- 'app/models/user.rb'
# Offense count: 4
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles.
Style/ClassCheck:
Enabled: false
# Offense count: 8
# Configuration parameters: CountComments.
Style/ClassLength:
Max: 524
Exclude:
- 'app/helpers/application_helper.rb'
- 'app/models/email_settings.rb'
- 'app/models/revision_observer.rb'
# Offense count: 1
Style/ClassVars:
Enabled: false
# Offense count: 2
# Cop supports --auto-correct.
# Configuration parameters: PreferredMethods.
Style/CollectionMethods:
Enabled: false
Exclude:
- 'spec/support/kneet_connections.rb'
# Offense count: 1
# Cop supports --auto-correct.
Style/ColonMethodCall:
Enabled: false
Exclude:
- 'app/models/contact.rb'
# Offense count: 4
# Offense count: 1
# Cop supports --auto-correct.
# Configuration parameters: Keywords.
Style/CommentAnnotation:
Enabled: false
Exclude:
- 'app/models/event_user.rb'
# Offense count: 4
# Offense count: 3
# Cop supports --auto-correct.
Style/CommentIndentation:
Enabled: false
Exclude:
- 'app/controllers/admin/comments_controller.rb'
- 'app/models/conference.rb'
- 'app/models/track.rb'
# Offense count: 10
Style/CyclomaticComplexity:
Max: 16
# Offense count: 5
# Cop supports --auto-correct.
Style/DeprecatedHashMethods:
Enabled: false
# Offense count: 228
# Offense count: 341
# Configuration parameters: Exclude.
Style/Documentation:
Enabled: false
# Offense count: 150
# Offense count: 97
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles.
Style/DotPosition:
Enabled: false
# Offense count: 9
# Offense count: 5
Style/DoubleNegation:
Enabled: false
Exclude:
- 'app/models/conference.rb'
# Offense count: 1
# Configuration parameters: Exclude.
Style/FileName:
Enabled: false
Exclude:
- 'Guardfile'
# Offense count: 8
# Offense count: 15
# Configuration parameters: MinBodyLength.
Style/GuardClause:
Enabled: false
Exclude:
- 'app/controllers/admin/base_controller.rb'
- 'app/controllers/admin/questions_controller.rb'
- 'app/controllers/application_controller.rb'
- 'app/controllers/conference_registrations_controller.rb'
- 'app/controllers/tickets_controller.rb'
- 'app/helpers/application_helper.rb'
- 'app/models/ability.rb'
- 'app/models/conference.rb'
- 'app/models/event.rb'
- 'app/models/registration.rb'
- 'app/models/ticket.rb'
- 'app/models/user.rb'
- 'db/migrate/20140820124117_undo_wrong_migration20140801080705_add_users_to_events.rb'
# Offense count: 27
# Cop supports --auto-correct.
# Configuration parameters: MaxLineLength.
Style/IfUnlessModifier:
Enabled: false
Exclude:
- 'app/controllers/admin/events_controller.rb'
- 'app/controllers/admin/schedules_controller.rb'
- 'app/controllers/conference_registrations_controller.rb'
- 'app/controllers/proposal_controller.rb'
- 'app/controllers/users/omniauth_callbacks_controller.rb'
- 'app/helpers/application_helper.rb'
- 'app/models/conference.rb'
- 'app/models/datatable.rb'
- 'app/models/event.rb'
- 'app/models/ticket_purchase.rb'
- 'app/models/user.rb'
- 'spec/controllers/admin/conferences_controller_spec.rb'
- 'spec/features/omniauth_spec.rb'
- 'spec/support/flash.rb'
- 'spec/support/save_feature_failures.rb'
# Offense count: 2
# Offense count: 3
# Cop supports --auto-correct.
Style/IndentArray:
Enabled: false
Exclude:
- 'app/controllers/admin/registrations_controller.rb'
- 'app/models/conference.rb'
# Offense count: 8
# Offense count: 4
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles.
Style/IndentHash:
Enabled: false
# Offense count: 2
# Cop supports --auto-correct.
Style/IndentationConsistency:
Enabled: false
# Offense count: 5
# Cop supports --auto-correct.
Style/IndentationWidth:
Enabled: false
# Configuration parameters: EnforcedStyle, SupportedStyles.
Style/IndentationConsistency:
Exclude:
- 'app/controllers/conference_controller.rb'
- 'app/controllers/users_controller.rb'
- 'app/models/event.rb'
- 'spec/controllers/subscriptions_controller_spec.rb'
- 'spec/models/cfp_spec.rb'
# Offense count: 7
# Offense count: 12
# Cop supports --auto-correct.
# Configuration parameters: Width.
Style/IndentationWidth:
Exclude:
- 'app/helpers/application_helper.rb'
- 'db/migrate/20140701123203_add_events_per_week_to_conference.rb'
- 'db/migrate/20141031225545_add_require_handicapped_access_to_questions.rb'
- 'db/migrate/20141031225606_add_attending_with_partner_to_questions.rb'
- 'db/migrate/20141031225620_add_staying_at_suggested_hotel_to_questions.rb'
- 'db/migrate/20141031225635_add_attending_social_events_to_questions.rb'
- 'db/migrate/20141118162030_change_lodging_association_to_conference.rb'
- 'spec/features/event_types_spec.rb'
- 'spec/models/cfp_spec.rb'
# Offense count: 6
# Cop supports --auto-correct.
Style/LeadingCommentSpace:
Enabled: false
Exclude:
- 'Guardfile'
- 'app/controllers/admin/commercials_controller.rb'
- 'app/controllers/commercials_controller.rb'
- 'app/models/comment.rb'
# Offense count: 5
# Offense count: 8
# Cop supports --auto-correct.
Style/LineEndConcatenation:
Enabled: false
Exclude:
- 'spec/features/cfp_spec.rb'
- 'spec/features/conference_spec.rb'
- 'spec/features/registration_periods_spec.rb'
# Offense count: 515
# Configuration parameters: AllowURI.
Style/LineLength:
Max: 217
# Offense count: 5
# Offense count: 7
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles.
Style/MethodDefParentheses:
Enabled: false
# Offense count: 68
# Configuration parameters: CountComments.
Style/MethodLength:
Max: 134
# Offense count: 14
# Offense count: 16
# Cop supports --auto-correct.
Style/NegatedIf:
Enabled: false
Exclude:
- 'app/controllers/admin/events_controller.rb'
- 'app/controllers/application_controller.rb'
- 'app/controllers/conference_registrations_controller.rb'
- 'app/controllers/proposal_controller.rb'
- 'app/models/conference.rb'
- 'app/models/datatable.rb'
- 'app/models/event.rb'
- 'app/models/venue.rb'
- 'db/migrate/20140820093735_migrating_supporter_registrations_to_ticket_users.rb'
# Offense count: 18
# Configuration parameters: EnforcedStyle, SupportedStyles.
# Configuration parameters: EnforcedStyle, MinBodyLength, SupportedStyles.
Style/Next:
Enabled: false
Exclude:
- 'app/controllers/admin/events_controller.rb'
- 'app/models/conference.rb'
- 'db/migrate/20140610173021_change_person_id_to_user_id_in_registrations.rb'
- 'db/migrate/20140611123926_change_person_id_to_user_id_in_votes.rb'
- 'db/migrate/20140701123203_add_events_per_week_to_conference.rb'
- 'db/migrate/20140731165107_move_conference_contact_details_to_contact.rb'
- 'db/migrate/20140801164901_move_conference_media_to_commercial.rb'
- 'db/migrate/20140801170430_move_event_media_to_commercial.rb'
- 'db/migrate/20140812065531_move_conference_registration_data_to_registration_periods.rb'
- 'db/migrate/20140820093735_migrating_supporter_registrations_to_ticket_users.rb'
- 'db/migrate/20140821103643_split_ticket_price_in_price_and_currency.rb'
- 'db/migrate/20140825093132_move_splashpage_attributes_from_conference_to_splashpage.rb'
- 'db/migrate/20141104131625_generate_username.rb'
- 'db/migrate/20141118162030_change_lodging_association_to_conference.rb'
- 'db/migrate/20141128073306_migrate_data_remove_column_include_cfp_in_splash_add_column_include_cfp.rb'
# Offense count: 1
# Cop supports --auto-correct.
Style/NumericLiterals:
MinDigits: 15
# Offense count: 1
# Offense count: 3
Style/OptionalArguments:
Exclude:
- 'app/models/event.rb'
# Offense count: 3
# Cop supports --auto-correct.
# Configuration parameters: AllowSafeAssignment.
Style/ParenthesesAroundCondition:
Enabled: false
Exclude:
- 'app/controllers/admin/base_controller.rb'
- 'app/controllers/application_controller.rb'
- 'app/helpers/application_helper.rb'
# Offense count: 11
# Offense count: 1
# Cop supports --auto-correct.
# Configuration parameters: PreferredDelimiters.
Style/PercentLiteralDelimiters:
Enabled: false
Exclude:
- 'app/serializers/event_serializer.rb'
# Offense count: 2
# Configuration parameters: NamePrefixBlacklist.
# Configuration parameters: NamePrefix, NamePrefixBlacklist.
Style/PredicateName:
Enabled: false
Exclude:
- 'app/models/comment.rb'
- 'app/models/contact.rb'
# Offense count: 3
# Offense count: 6
# Configuration parameters: SupportedStyles.
Style/RaiseArgs:
EnforcedStyle: compact
# Offense count: 3
# Offense count: 1
# Cop supports --auto-correct.
Style/RedundantBegin:
Enabled: false
Exclude:
- 'app/models/revision_observer.rb'
# Offense count: 3
# Cop supports --auto-correct.
# Configuration parameters: AllowMultipleReturnValues.
Style/RedundantReturn:
Enabled: false
Exclude:
- 'app/helpers/application_helper.rb'
# Offense count: 8
# Offense count: 33
# Cop supports --auto-correct.
Style/RedundantSelf:
Enabled: false
Exclude:
- 'app/models/call_for_paper.rb'
- 'app/models/comment.rb'
- 'app/models/conference.rb'
- 'app/models/event.rb'
- 'app/models/question.rb'
- 'app/models/ticket.rb'
- 'app/models/user.rb'
- 'app/models/venue.rb'
# Offense count: 10
# Configuration parameters: MaxSlashes.
# Offense count: 2
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerSlashes.
Style/RegexpLiteral:
Enabled: false
# Offense count: 1
Style/SelfAssignment:
Enabled: false
Exclude:
- 'Guardfile'
# Offense count: 3
# Cop supports --auto-correct.
Style/SelfAssignment:
Exclude:
- 'app/models/event.rb'
- 'db/migrate/20141104131625_generate_username.rb'
- 'spec/support/save_feature_failures.rb'
# Offense count: 7
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles.
Style/SignalException:
Enabled: false
# Offense count: 1
# Configuration parameters: Methods.
Style/SingleLineBlockParams:
Enabled: false
Exclude:
- 'app/controllers/admin/base_controller.rb'
- 'app/controllers/application_controller.rb'
- 'app/models/user.rb'
- 'db/migrate/20140730104658_migrate_roles_for_cancancan.rb'
- 'db/migrate/20140820123503_assign_users_to_events.rb'
- 'db/migrate/20140820124117_undo_wrong_migration20140801080705_add_users_to_events.rb'
- 'db/migrate/20150929142405_change_postalcode_format_in_venues.rb'
# Offense count: 1
# Cop supports --auto-correct.
# Configuration parameters: AllowIfMethodIsEmpty.
Style/SingleLineMethods:
Enabled: false
Exclude:
- 'Guardfile'
# Offense count: 285
# Offense count: 20
# Cop supports --auto-correct.
Style/SingleSpaceBeforeFirstArg:
Enabled: false
# Offense count: 4
# Cop supports --auto-correct.
Style/SpaceAfterComma:
Enabled: false
Exclude:
- 'app/controllers/conference_registrations_controller.rb'
- 'db/migrate/20121223110942_devise_create_users.rb'
- 'db/migrate/20130107114930_create_versions.rb'
- 'db/migrate/20140719160903_create_delayed_jobs.rb'
- 'spec/features/venues_spec.rb'
# Offense count: 4
# Cop supports --auto-correct.
@ -220,12 +361,17 @@ Style/SpaceAfterComma:
Style/SpaceAroundEqualsInParameterDefault:
Enabled: false
# Offense count: 5
# Offense count: 11
# Cop supports --auto-correct.
# Configuration parameters: MultiSpaceAllowedForOperators.
Style/SpaceAroundOperators:
Enabled: false
Exclude:
- 'app/controllers/application_controller.rb'
- 'app/models/call_for_paper.rb'
- 'app/models/datatable.rb'
- 'db/migrate/20141128073306_migrate_data_remove_column_include_cfp_in_splash_add_column_include_cfp.rb'
# Offense count: 2
# Offense count: 220
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles.
Style/SpaceBeforeBlockBraces:
@ -234,38 +380,56 @@ Style/SpaceBeforeBlockBraces:
# Offense count: 1
# Cop supports --auto-correct.
Style/SpaceBeforeSemicolon:
Enabled: false
Exclude:
- 'Guardfile'
# Offense count: 6
# Offense count: 28
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles, EnforcedStyleForEmptyBraces, SpaceBeforeBlockParameters.
Style/SpaceInsideBlockBraces:
Enabled: false
# Offense count: 4
# Offense count: 15
# Cop supports --auto-correct.
Style/SpaceInsideBrackets:
Enabled: false
Exclude:
- 'app/models/conference.rb'
- 'app/models/user.rb'
- 'spec/controllers/admin/conferences_controller_spec.rb'
- 'spec/views/admin/events/index.html.haml_spec.rb'
# Offense count: 6
# Offense count: 8
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces, SupportedStyles.
Style/SpaceInsideHashLiteralBraces:
Enabled: false
# Offense count: 1
# Offense count: 28
# Cop supports --auto-correct.
Style/Tab:
Enabled: false
Exclude:
- 'db/migrate/20141031225545_add_require_handicapped_access_to_questions.rb'
- 'db/migrate/20141031225606_add_attending_with_partner_to_questions.rb'
- 'db/migrate/20141031225620_add_staying_at_suggested_hotel_to_questions.rb'
- 'db/migrate/20141031225635_add_attending_social_events_to_questions.rb'
- 'db/migrate/20141118162030_change_lodging_association_to_conference.rb'
- 'spec/features/campaign_spec.rb'
- 'spec/features/event_types_spec.rb'
- 'spec/models/cfp_spec.rb'
# Offense count: 24
# Offense count: 26
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyleForMultiline, SupportedStyles.
Style/TrailingComma:
Enabled: false
Exclude:
- 'Guardfile'
- 'app/models/target.rb'
- 'db/migrate/20140701123203_add_events_per_week_to_conference.rb'
- 'spec/controllers/admin/conferences_controller_spec.rb'
- 'spec/models/conference_spec.rb'
# Offense count: 8
# Offense count: 3
# Cop supports --auto-correct.
# Configuration parameters: WordRegex.
Style/WordArray:
MinSize: 5
Style/AccessorMethodName:
Enabled: false
MinSize: 2

2
app/controllers/admin/comments_controller.rb
View file

@ -22,7 +22,7 @@ module Admin
# Grouping all comments by conference, and by event. It returns {:conference => {:event => [{comment_2}, {comment_1 }]}}
def grouped_comments(remarks)
remarks.group_by{ |comment| comment.commentable.conference }.map {|conference, comments| [conference, comments.group_by{|comment| comment.commentable}]}.to_h
remarks.group_by{ |comment| comment.commentable.conference }.map {|conference, comments| [conference, comments.group_by(&:commentable)]}.to_h
end
end
end

7
app/controllers/admin/questions_controller.rb
View file

@ -73,12 +73,9 @@ module Admin
# Delete question and its answers
begin
Question.transaction do
@question.destroy
@question.answers.each do |a|
a.destroy
end
flash[:notice] = "Deleted question: #{@question.title} and its answers: #{@question.answers.map {|a| a.title}.join ','}"
@question.answers.each(&:destroy)
flash[:notice] = "Deleted question: #{@question.title} and its answers: #{@question.answers.map(&:title).join ','}"
end
rescue ActiveRecord::RecordInvalid
flash[:error] = 'Could not delete question.'

4
app/helpers/application_helper.rb
View file

@ -184,7 +184,7 @@ module ApplicationHelper
end
def event_types(conference)
all = conference.event_types.map { |et | et.title.pluralize }
all = conference.event_types.map { |et| et.title.pluralize }
first = all[0...-1]
last = all[-1]
ets = ''
@ -198,7 +198,7 @@ module ApplicationHelper
end
def tracks(conference)
all = conference.tracks.map {|t| t.name}
all = conference.tracks.map(&:name)
first = all[0...-1]
last = all[-1]
ts = ''

8
app/models/ability.rb
View file

@ -50,12 +50,8 @@ class Ability
can :show, Commercial, commercialable_type: 'Event', commercialable_id: Event.where(state: 'confirmed').pluck(:id)
can :show, User
unless CONFIG['authentication']['ichain']['enabled']
can [:show, :create], Registration do |registration|
registration.new_record?
end
can [:show, :create], Event do |event|
event.new_record?
end
can [:show, :create], Registration, &:new_record?
can [:show, :create], Event, &:new_record?
end
end

1
app/models/call_for_paper.rb
View file

@ -49,6 +49,7 @@ class CallForPaper < ActiveRecord::Base
&& !self.conference.email_settings.call_for_papers_dates_updates_subject.blank?\
&& !self.conference.email_settings.call_for_papers_dates_updates_template.blank?
end
##
# Checks whether cfp dates is updated
#

2
app/models/conference.rb
View file

@ -1,6 +1,6 @@
##
# This class represents a conference
# rubocop:disable Style/ClassLength
# rubocop:disable Metrics/ClassLength
class Conference < ActiveRecord::Base
require 'uri'
serialize :events_per_week, Hash

2
app/models/datatable.rb
View file

@ -74,7 +74,7 @@ class Datatable
def sort_order
colnum = 0
sort_by = []
while true
loop do
break if !sorted?(colnum)
sort_by << "#{sort_column(colnum)} #{sort_direction(colnum)}"
colnum += 1

2
app/models/user.rb
View file

@ -134,7 +134,7 @@ class User < ActiveRecord::Base
result = {}
Role::ACTIONABLES.each do |role|
resources = self.roles.where(name: role.parameterize.underscore).map{ |myrole| Conference.find(myrole.resource_id).short_title }.join ', '
result[role.parameterize.underscore] = "(#{ resources })" unless resources.blank?
result[role.parameterize.underscore] = "(#{resources})" unless resources.blank?
end
result
end

14
bin/setup
View file

@ -8,9 +8,9 @@ Dir.chdir APP_ROOT do
# This script is a starting point to setup your application.
# Add necessary setup steps to this file:
puts "== Installing dependencies =="
system "gem install bundler --conservative"
system "bundle check || bundle install"
puts '== Installing dependencies =='
system 'gem install bundler --conservative'
system 'bundle check || bundle install'
# puts "\n== Copying sample files =="
# unless File.exist?("config/database.yml")
@ -18,12 +18,12 @@ Dir.chdir APP_ROOT do
# end
puts "\n== Preparing database =="
system "bin/rake db:setup"
system 'bin/rake db:setup'
puts "\n== Removing old logs and tempfiles =="
system "rm -f log/*"
system "rm -rf tmp/cache"
system 'rm -f log/*'
system 'rm -rf tmp/cache'
puts "\n== Restarting application server =="
system "touch tmp/restart.txt"
system 'touch tmp/restart.txt'
end

4
db/migrate/20140730104658_migrate_roles_for_cancancan.rb
View file

@ -17,9 +17,7 @@ class MigrateRolesForCancancan < ActiveRecord::Migration
end
# Delete old roles
Role.first(old_roles).each do |role|
role.destroy
end
Role.first(old_roles).each(&:destroy)
end
def down

1
spec/controllers/admin/comments_controller_spec.rb
View file

@ -1,7 +1,6 @@
require 'spec_helper'
describe Admin::CommentsController, type: :controller do
# It is necessary to use bang version of let to build roles before user
let(:conference) { create(:conference) }
let!(:first_user) { create(:user) }

14
spec/controllers/admin/conferences_controller_spec.rb
View file

@ -1,7 +1,6 @@
require 'spec_helper'
describe Admin::ConferenceController do
# It is necessary to use bang version of let to build roles before user
let(:conference) { create(:conference, end_date: Date.new(2014, 05, 26) + 15) }
let!(:first_user) { create(:user) }
@ -12,11 +11,8 @@ describe Admin::ConferenceController do
let(:participant) { create(:user) }
shared_examples 'access as organizer' do
describe 'PATCH #update' do
context 'valid attributes' do
it 'locates the requested conference' do
patch :update, id: conference.short_title, conference: attributes_for(:conference, title: 'Example Con')
expect(assigns(:conference)).to eq(conference)
@ -181,9 +177,7 @@ describe Admin::ConferenceController do
context 'no conferences' do
it 'redirect to new conference' do
Conference.all.each do |c|
c.destroy
end
Conference.all.each(&:destroy)
sign_in create(:admin)
get :index
expect(response).to redirect_to new_admin_conference_path
@ -289,7 +283,6 @@ describe Admin::ConferenceController do
describe 'DELETE #remove_user' do
before(:each) do
end
it 'sets selection variable' do
@ -329,13 +322,11 @@ describe Admin::ConferenceController do
end
describe 'organizer access' do
before do
sign_in(organizer)
end
it_behaves_like 'access as organizer'
end
shared_examples 'access as participant or guest' do |path, message|
@ -399,12 +390,9 @@ describe Admin::ConferenceController do
end
it_behaves_like 'access as participant or guest', :root_path, 'You are not authorized to access this area!'
end
describe 'guest access' do
it_behaves_like 'access as participant or guest', :new_user_session_path
end
end

6
spec/controllers/admin/registration_periods_controller_spec.rb
View file

@ -1,7 +1,6 @@
require 'spec_helper'
describe Admin::RegistrationPeriodsController do
# It is necessary to use bang version of let to build roles before user
let(:conference) { create(:conference) }
let!(:first_user) { create(:user) }
@ -12,15 +11,12 @@ describe Admin::RegistrationPeriodsController do
let(:participant) { create(:user) }
shared_examples 'access as administration or organizer' do
before do
conference.registration_period = create(:registration_period)
end
describe 'PATCH #update' do
context 'valid attributes' do
it 'locates the requested registration period object' do
patch :update, conference_id: conference.short_title, conference: attributes_for(:registration_period)
expect(assigns(:registration_period)).to eq(conference.registration_period)
@ -153,12 +149,10 @@ describe Admin::RegistrationPeriodsController do
end
describe 'organizer access' do
before(:each) do
sign_in(organizer)
end
it_behaves_like 'access as administration or organizer'
end
end

1
spec/controllers/conference_controller_spec.rb
View file

@ -30,5 +30,4 @@ describe ConferenceController do
expect(response.response_code).to eq(200)
end
end
end

1
spec/factories/difficulty_levels.rb
View file

@ -5,5 +5,4 @@ FactoryGirl.define do
color '#ffffff'
conference
end
end

1
spec/factories/event_types.rb
View file

@ -8,5 +8,4 @@ FactoryGirl.define do
maximum_abstract_length 500
conference
end
end

1
spec/factories/events.rb
View file

@ -50,6 +50,5 @@ FactoryGirl.define do
event.comment_threads << build(:comment, commentable: event)
end
end
end
end

1
spec/factories/roles.rb
View file

@ -1,6 +1,5 @@
FactoryGirl.define do
factory :role do
factory :organizer_role do
name 'organizer'
end

1
spec/factories/social_events.rb
View file

@ -5,5 +5,4 @@ FactoryGirl.define do
date { Date.today }
conference
end
end

1
spec/factories/subscriptions.rb
View file

@ -3,5 +3,4 @@ FactoryGirl.define do
user
conference
end
end

1
spec/factories/tracks.rb
View file

@ -5,5 +5,4 @@ FactoryGirl.define do
color '#ffffff'
conference
end
end

1
spec/factories/vdays.rb
View file

@ -4,5 +4,4 @@ FactoryGirl.define do
description 'Lorem Ipsum dolsum'
conference
end
end

1
spec/factories/vpositions.rb
View file

@ -8,5 +8,4 @@ FactoryGirl.define do
vposition.vdays << build(:vday, conference: vposition.conference)
end
end
end

1
spec/features/campaign_spec.rb
View file

@ -1,7 +1,6 @@
require 'spec_helper'
feature Campaign do
let!(:conference) { create(:conference, short_title: 'osc14') }
let!(:organizer_role) { create(:organizer_role, resource: conference) }
let!(:organizer) { create(:user, role_ids: [organizer_role.id]) }

1
spec/features/cfp_spec.rb
View file

@ -1,7 +1,6 @@
require 'spec_helper'
feature Conference do
let!(:conference) { create(:conference) }
let!(:organizer_role) { create(:organizer_role, resource: conference) }
let!(:organizer) { create(:user, role_ids: [organizer_role.id]) }

3
spec/features/contact_spec.rb
View file

@ -1,13 +1,11 @@
require 'spec_helper'
feature Contact do
let!(:conference) { create(:conference) }
let!(:organizer_role) { create(:organizer_role, resource: conference) }
let!(:organizer) { create(:user, email: 'admin@example.com', role_ids: [organizer_role.id]) }
shared_examples 'update a contact' do
scenario 'sucessfully', feature: true, js: true do
contact = conference.contact
expected_count = Contact.count
@ -42,5 +40,4 @@ feature Contact do
describe 'organizer' do
it_behaves_like 'update a contact', :organizer
end
end

3
spec/features/difficulty_levels_spec.rb
View file

@ -7,7 +7,6 @@ feature DifficultyLevel do
shared_examples 'difficulty levels' do
scenario 'adds difficulty level', feature: true, js: true do
sign_in organizer
visit admin_conference_difficulty_levels_path(
conference_id: conference.short_title)
@ -31,7 +30,6 @@ feature DifficultyLevel do
end
scenario 'updates difficulty level', feature: true, js: true do
conference.difficulty_levels << create(:difficulty_level)
sign_in organizer
visit admin_conference_difficulty_levels_path(
@ -51,7 +49,6 @@ feature DifficultyLevel do
expect(page.has_content?('Hard Events')).to be true
end
end
end
describe 'organizer' do

2
spec/features/email_spec.rb
View file

@ -8,7 +8,6 @@ feature EmailSettings do
shared_examples 'email settings' do
scenario 'updates email settings',
feature: true, js: true do
expected_count = EmailSettings.count
sign_in organizer
@ -88,7 +87,6 @@ feature EmailSettings do
value).to eq('Updated conference venue template')
expect(EmailSettings.count).to eq(expected_count)
end
end

1
spec/features/event_types_spec.rb
View file

@ -7,7 +7,6 @@ feature EventType do
shared_examples 'event types' do
scenario 'adds and updates event type', feature: true, js: true do
sign_in organizer
visit admin_conference_event_types_path(
conference_id: conference.short_title)

1
spec/features/omniauth_spec.rb
View file

@ -2,7 +2,6 @@ require 'spec_helper'
feature Openid do
shared_examples 'sign in with openid' do
scenario 'has option to log in with Google account' do
visit '/accounts/sign_in'
expect(page.has_content?('or sign in using')).to be true

1
spec/features/registration_periods_spec.rb
View file

@ -1,7 +1,6 @@
require 'spec_helper'
feature RegistrationPeriod do
# It is necessary to use bang version of let to build roles before user
let!(:conference) { create(:conference) }
let!(:organizer_role) { create(:organizer_role, resource: conference) }

1
spec/features/splashpage_spec.rb
View file

@ -1,7 +1,6 @@
require 'spec_helper'
feature Splashpage do
# It is necessary to use bang version of let to build roles before user
let!(:conference) { create(:conference) }
let!(:organizer_role) { create(:organizer_role, resource: conference) }

1
spec/features/ticket_purchases_spec.rb
View file

@ -15,7 +15,6 @@ feature Registration do
end
context 'who is not registered' do
scenario 'purchases a ticket', feature: true, js: true do
visit root_path
click_link 'Register'

1
spec/features/tracks_spec.rb
View file

@ -7,7 +7,6 @@ feature Track do
shared_examples 'tracks' do
scenario 'adds a track', feature: true, js: true do
sign_in organizer
visit admin_conference_tracks_path(conference_id: conference.short_title)

2
spec/features/user_spec.rb
View file

@ -1,9 +1,7 @@
require 'spec_helper'
feature User do
shared_examples 'admin ability' do
end
describe 'admin' do

2
spec/features/venues_spec.rb
View file

@ -7,7 +7,6 @@ feature Conference do
shared_examples 'venue' do
scenario 'adds and updates venue' do
sign_in organizer
# create the venue
@ -53,5 +52,4 @@ feature Conference do
describe 'organizer' do
it_behaves_like 'venue'
end
end

2
spec/models/commercial_spec.rb
View file

@ -1,8 +1,6 @@
require 'spec_helper'
describe Commercial do
it { should validate_presence_of(:commercial_id) }
it { should validate_presence_of(:commercial_type) }
end

27
spec/models/conference_spec.rb
View file

@ -3,11 +3,9 @@
require 'spec_helper'
describe Conference do
let(:subject) { create(:conference, end_date: '2014-06-30') }
describe '#write_event_distribution_to_db' do
it 'updates pending conferences' do
create(:conference,
start_date: Date.today - 2.weeks,
@ -298,7 +296,6 @@ describe Conference do
expect(subject.get_top_submitter.values).to eq([3, 1])
expect(subject.get_top_submitter.keys).to eq([e2.submitter, e1.submitter])
end
end
describe '#get_targets' do
@ -391,7 +388,6 @@ describe Conference do
describe '#new_program_minutes' do
it 'calculates correct values with events' do
create(:event, conference: subject, event_type: @long, created_at: Time.now - 3.days)
create(:event, conference: subject, event_type: @long)
create(:event, conference: subject, event_type: @short, created_at: Time.now - 3.days)
@ -418,7 +414,6 @@ describe Conference do
end
describe '#difficulty_levels_distribution' do
it 'calculates correct for different difficulty levels' do
create(:event, conference: subject, difficulty_level: @easy)
create(:event, conference: subject, difficulty_level: @easy)
@ -700,7 +695,6 @@ describe Conference do
end
describe '#get_active_conferences' do
it 'returns pending conferences' do
a = create(:conference,
short_title: 'a', start_date: Time.now + 14.days,
@ -779,7 +773,6 @@ describe Conference do
end
describe '#event_distribution' do
before(:each) do
@conference = create(
:conference,
@ -947,7 +940,6 @@ describe Conference do
end
describe '#get_status' do
before(:each) do
# Setup positive result hash
@result = {}
@ -961,7 +953,7 @@ describe Conference do
@result['splashpage'] = true
# Setup negative result hash
@result_false = Hash.new
@result_false = {}
@result.each { |key, value| @result_false[key] = !value }
@result['short_title'] = @result_false['short_title'] = subject.short_title
@ -1123,7 +1115,6 @@ describe Conference do
end
describe '#registration_weeks' do
it 'calculates new year' do
subject.registration_period = create(:registration_period,
start_date: Date.new(2013, 12, 31),
@ -1154,7 +1145,6 @@ describe Conference do
end
describe '#cfp_weeks' do
it 'calculates new year' do
cfp = create(:call_for_paper)
cfp.start_date = Date.new(2013, 12, 30)
@ -1189,7 +1179,6 @@ describe Conference do
end
describe '#get_submissions_per_week' do
it 'does calculate correct if cfp start date is altered' do
cfp = create(:call_for_paper)
cfp.start_date = Date.new(2014, 05, 26)
@ -1278,7 +1267,6 @@ describe Conference do
end
describe '#get_registrations_per_week' do
it 'pads with zeros if there are no registrations' do
subject.registration_period = create(:registration_period,
start_date: Date.new(2014, 05, 26),
@ -1384,9 +1372,7 @@ describe Conference do
end
describe '#pending?' do
context 'is pending' do
it '#pending? is true' do
subject.start_date = Date.today + 10
expect(subject.pending?).to be true
@ -1394,7 +1380,6 @@ describe Conference do
end
context 'is not pending' do
it '#pending? is false' do
subject.start_date = Date.today - 10
expect(subject.pending?).to be false
@ -1403,16 +1388,13 @@ describe Conference do
end
describe '#registration_open?' do
context 'closed registration' do
it '#registration_open? is false' do
expect(subject.registration_open?).to be false
end
end
context 'open registration' do
before do
enrollment = create(:registration_period,
start_date: Date.today - 1,
@ -1427,17 +1409,13 @@ describe Conference do
end
describe '#cfp_open?' do
context 'closed cfp' do
it '#cfp_open? is false' do
expect(subject.cfp_open?).to be false
end
end
context 'open cfp' do
before do
subject.call_for_paper = create(:call_for_paper)
end
@ -1449,7 +1427,6 @@ describe Conference do
end
describe '#user_registered?' do
# It is necessary to use bang version of let to build roles before user
let!(:conference) { create(:conference) }
let!(:organizer_role) { create(:organizer_role, resource: conference) }
@ -1483,7 +1460,6 @@ describe Conference do
end
describe 'validations' do
it 'has a valid factory' do
expect(build(:conference)).to be_valid
end
@ -1517,7 +1493,6 @@ describe Conference do
end
describe 'before create callbacks' do
it 'has an email setting after creation' do
expect(subject.email_settings).not_to be_nil
end

1
spec/models/event_spec.rb
View file

@ -1,7 +1,6 @@
require 'spec_helper'
describe Event do
describe 'abstract_word_count' do
it 'counts words in abstract' do
event = build(:event)

1
spec/models/sponsorship_level_spec.rb
View file

@ -2,7 +2,6 @@ require 'spec_helper'
describe SponsorshipLevel do
describe 'validations' do
it 'has a valid factory' do
expect(build(:sponsorship_level)).to be_valid
end

1
spec/models/target_spec.rb
View file

@ -1,7 +1,6 @@
require 'spec_helper'
describe Target do
describe 'validations' do
it 'has a valid factory' do
expect(build(:target)).to be_valid

2
spec/models/ticket_purchase_spec.rb
View file

@ -1,7 +1,6 @@
require 'spec_helper'
describe TicketPurchase do
describe 'validations' do
it 'has a valid factory' do
expect(build(:ticket_purchase)).to be_valid
@ -34,7 +33,6 @@ describe TicketPurchase do
it 'is valid with a quantity greater than zero' do
should allow_value(1).for(:quantity)
end
end
describe 'self#purchase' do

1
spec/models/user_spec.rb
View file

@ -1,7 +1,6 @@
require 'spec_helper'
describe User do
# It is necessary to use bang version of let to build roles before user
let!(:user_admin) { create(:user) }
let!(:conference) { create(:conference) }

1
spec/spec_helper.rb
View file

@ -92,7 +92,6 @@ RSpec.configure do |config|
# Types of tests (controller, feature, model) will
# be inferred from subfolder name
config.infer_spec_type_from_file_location!
end
OmniAuth.config.test_mode = true

2
spec/support/factory_girl.rb
View file

@ -1,7 +1,5 @@
RSpec.configure do |config|
config.before(:suite) do
FactoryGirl.lint
end
end

2
spec/support/flash.rb
View file

@ -5,7 +5,7 @@ module Flash
return 'none'
end
if results.count > 1
texts = results.map { |r| r.text }
texts = results.map(&:text)
fail "One flash expected, but we had #{texts.inspect}"
end
results.first.text

2
spec/support/save_feature_failures.rb
View file

@ -3,7 +3,7 @@
RSpec.configure do |config|
config.after(:each, type: :feature) do
ename = RSpec.current_example.full_description
ename = ename.gsub ' ', '_'
ename = ename.tr ' ', '_'
ename.downcase!
ename = ename + '.html'
if RSpec.current_example.exception.present?

2
spec/views/admin/call_for_papers/show.html.haml_spec.rb
View file

@ -1,7 +1,6 @@
require 'spec_helper'
describe 'admin/call_for_papers/show' do
it 'renders call for papers details' do
assign :conference, create(:conference)
assign :call_for_paper, create(:call_for_paper)
@ -11,5 +10,4 @@ describe 'admin/call_for_papers/show' do
expect(rendered).to include(1.day.ago.strftime('%A, %B %-d. %Y'))
expect(rendered).to include(6.days.from_now.strftime('%A, %B %-d. %Y'))
end
end

1
spec/views/admin/conference/edit.html.haml_spec.rb
View file

@ -1,7 +1,6 @@
require 'spec_helper'
describe 'admin/conference/edit' do
it 'renders conference details which are editable' do
@conference = create(:conference, title: 'openSUSE')
assign :conference, @conference

1
spec/views/admin/conference/show.html.haml_spec.rb
View file

@ -1,7 +1,6 @@
require 'spec_helper'
describe 'admin/conference/show' do
it 'renders conference dashboard' do
conference = create(:conference, title: 'openSUSE')
assign :conference, conference

1
spec/views/admin/difficulty_levels/index.html.haml_spec.rb
View file

@ -1,7 +1,6 @@
require 'spec_helper'
describe 'admin/difficulty_levels/index' do
it 'renders difficulty levels' do
@difficulty_level = create(:difficulty_level)
assign :conference, @difficulty_level.conference

1
spec/views/admin/emails/index.html.haml_spec.rb
View file

@ -1,6 +1,5 @@
require 'spec_helper'
describe 'admin/emails/index' do
it 'renders email templates' do
@conference = create(:conference)
assign :conference, @conference

1
spec/views/admin/event_types/index.html.haml_spec.rb
View file

@ -1,7 +1,6 @@
require 'spec_helper'
describe 'admin/event_types/index' do
it 'renders event types' do
@event_type = create(:event_type)
assign :conference, @event_type.conference

2
spec/views/admin/rooms/index.html.haml_spec.rb
View file

@ -1,6 +1,5 @@
require 'spec_helper'
describe 'admin/rooms/index' do
it 'renders rooms list' do
@room = create(:room)
assign :conference, @room.conference
@ -8,5 +7,4 @@ describe 'admin/rooms/index' do
expect(rendered).to include('Example Room')
expect(rendered).to include('4')
end
end

1
spec/views/admin/tracks/index.html.haml_spec.rb
View file

@ -1,7 +1,6 @@
require 'spec_helper'
describe 'admin/tracks/index' do
it 'renders tracks' do
@track = create(:track)
assign :conference, @track.conference

1
spec/views/admin/volunteers/index.html.haml_spec.rb
View file

@ -1,7 +1,6 @@
require 'spec_helper'
describe 'admin/volunteers/index' do
it 'renders volunteers days as vdays' do
@vday = create(:vday)
@vday.conference.update_attributes(use_volunteers: true, use_vdays: true)