Commit graph

109 commits

Author SHA1 Message Date
Henne Vogelsang
81ddb76c24 Merge pull request #994 from differentreality/allow_nil_max_attendees
allow max_attendees to be nil
2016-05-19 12:03:43 +02:00
Henne Vogelsang
6a127a29a3 Merge pull request #1001 from ChrisBr/ability
Fixes ability
2016-05-19 12:01:31 +02:00
Christian Bruckmayer
406e37a1d8 Adapt ability to allow proposal creation if cfp is open
This was not possible before when iChain was enabled.
- Initialize @event object now with load_and_autorize before filter
- Remove not necessary event_users initilization in :new action
- Adapt ability and feature tests
2016-05-19 11:47:41 +02:00
Nishanth Vijayan
09b6e06a8c Fix ability model spec
Cancancan does not support  testing multiple permissions in one be_able_to clause
Replace all occurrences of such examples with separate examples for each permission
2016-05-15 21:18:19 +05:30
Stella Rouzi
528243c8b9 Allow max_attendees to be nil 2016-05-15 14:01:36 +03:00
Henne Vogelsang
73ce49de25 Use dynamic fake data in the spec 2016-05-02 16:06:32 +02:00
Ana
e082e7599d biography test fixed 2016-04-27 00:27:44 +02:00
Ana
5c044a801d Word limit on user biography 2016-04-27 00:27:44 +02:00
Stella Rouzi
01ec43e53a Registration for Events 2016-04-26 16:11:40 +03:00
Stella Rouzi
0a5ba7a204 Merge pull request #942 from nishanthvijayan/fix-roles-authorization
Fix authorization issues with Roles
2016-04-25 17:18:24 +02:00
Aditya Prakash
3bb220d3a9 Add test for user model
bang(!) was removed cause it was not needed and slowing single
test runs
2016-04-17 15:15:33 +05:30
Stella Rouzi
b9e10922ee drop dietary choices, social events, and html_export_path 2016-04-09 16:29:20 +03:00
Nishanth Vijayan
90d978f588 Improve ability test to test roles authorization 2016-04-09 17:43:42 +05:30
Henne Vogelsang
f56fc0052f Merge pull request #907 from sonalkr132/proposal-test
Proposal controller improvements and test
2016-04-01 14:49:50 +02:00
Henne Vogelsang
1979c0d9c1 Merge pull request #886 from sonalkr132/auth-registration
Fix authorization of new and create in ConferenceRegistrationsController
2016-03-30 17:29:10 +02:00
Christian Bruckmayer
c349700e72 Merge pull request #917 from sonalkr132/email-setting-tests
Add test for email_settings model
2016-03-29 15:40:42 -06:00
Aditya Prakash
4129955835 Move hash merge in before block and add test for missing name 2016-03-29 23:10:19 +05:30
Aditya Prakash
459a281230 Add test for email_settings model 2016-03-28 20:29:19 +05:30
Nishanth Vijayan
77649d73a6 Add model test to verify role is not deleted on removing all of its users 2016-03-28 19:51:20 +05:30
Aditya Prakash
e851c0b4ff Add authorization rule for create user by unsigned user
Add authorization to failed user save path cause it was complaining
that no authorization was performed in that path.
2016-03-24 17:42:00 +05:30
Aditya Prakash
eae6d90e9f Fix authorization of new and create in ConferenceRegistrationsController
Before authorization we need to set conference relation.
Change in proposal spec cause conference has to have valid registration
period for successful redirect to registration after confirm proposal.
2016-03-23 21:30:05 +05:30
Henne Vogelsang
10ef898a0d Merge pull request #872 from sonalkr132/proposal-after-cfp
Allow submission of proposal only if program has cfp
2016-03-23 16:34:12 +01:00
Aditya Prakash
53f732ce9c Add model test for sponsership_level 2016-03-22 18:38:42 +05:30
Aditya Prakash
3e32c58460 Allow submission of proposal only if program has cfp 2016-03-18 09:18:05 +05:30
Aditya Prakash
07d674ee2b Add model test for registration 2016-03-17 14:37:30 +05:30
Christian Bruckmayer
9e67a1bcd5 Merge pull request #876 from rishabhs95/delete-tickets-unregistered
Destroying tickets belonging to a user after user unregisters from a conference
2016-03-16 12:54:21 -06:00
Rishabh Saxena
8334619029 callback for destroying registration and writing tests for it
writing tests for deleting tickets after unregistering

removing code duplication in tests
2016-03-16 23:31:57 +05:30
Henne Vogelsang
cb9cf0359b Merge pull request #854 from sonalkr132/test-user-admin
Enforce non-admin attribute of user factory
2016-03-14 15:19:05 +01:00
Aditya Prakash
d2b392e119 Remove assumption from test that first user is admin 2016-03-14 17:29:35 +05:30
Aditya Prakash
0619eb7963 Enforce non-admin attribute of user factory
Change in other specs to match the new factory setup.
2016-03-14 17:29:33 +05:30
Ana
8ae7155218 #name test added 2016-03-13 01:37:11 +01:00
Christian Bruckmayer
a6c89351c5 Make Comment find_since_last_login scope robust against nil value
to fix production ArgumentError: bad value for range. Fixes #807.
2016-03-10 15:04:14 +01:00
Stella Rouzi
782a1f071f Merge pull request #801 from sonalkr132/targets_test
Model and controller tests for Target
2016-03-09 12:13:53 +02:00
Stella Rouzi
1990d3a1ad Merge pull request #837 from sonalkr132/room-ticket-tests
Tests for room model and controller
2016-03-09 12:04:12 +02:00
Aditya Prakash
ebd01f064a Tests for ticket model
Change in error message of validation cause previously it was:
"Price currency Currency is different.."
`paid?` method returned true even when `ticket_purchases` is empty for
a given user.
2016-03-06 17:37:06 +05:30
Aditya Prakash
69a4139268 Tests for room model 2016-03-06 17:09:02 +05:30
Aditya Prakash
680d23a64a Tests for target model
created_at and due_date are preset cause we don't want it to depend
on system time.
2016-03-06 10:46:03 +05:30
Stella Rouzi
81c82466f8 Add tests for Event. Remove redundant function 'def week' from Event. 2016-03-04 19:46:25 +02:00
Stella
ccd7ecbb90 Roles into their own controller. Rework interface. Add flash messages to ajax calls. Add description to roles. Possible to edit roles in use. 2016-03-01 17:10:45 +02:00
Stella Rouzi
f567187d45 Add validations for registration_period 2016-02-23 12:57:45 +02:00
David Sedeño
28fbc518f3 Add registration_limit to conference model. Added the input for registration limit in the edit conference form. In the controller, if the limit has exceeded redirect to root_path with an alert. fix #761 2016-02-10 15:59:39 +01:00
Stella Rouzi
f840f2b3f0 Rooms belong to venue 2016-02-06 17:43:51 +01:00
Stella Rouzi
feabbfbc99 rebase against email settings changes 2016-02-06 17:42:51 +01:00
Stella Rouzi
444356fbc7 Introduce Program to include cfp/rooms/tracks/events/event_types/difficulty_levels 2016-02-06 17:42:51 +01:00
Christian Bruckmayer
9e9c536946 Update rails to version 4.2
Furthermore it was necessary to add the following gems:
- responders
- web-console

And additional it was necessary to update these gems manually:
- devise
- turbolinks
- delayed_job_active_record
- money-rails

And the corresponding dependencies.
http://edgeguides.rubyonrails.org/upgrading_ruby_on_rails.html#upgrading-from-rails-4-1-to-rails-4-2
2016-01-26 10:04:08 +01:00
Christian Bruckmayer
57610eb39e Merge pull request #716 from differentreality/abilities
Abilities: Minor changes & grooming
2016-01-25 17:20:24 +01:00
chrisbr
23664119bd Implement simplified commercials workflow
It's now possible to simply enter the url of the third party provider to enter a commercial.
2016-01-21 19:41:12 +01:00
chinmaydd
4eafa43f7e Fixes Start date being greater than End date 2016-01-21 00:26:37 +05:30
Stella Rouzi
8ffa8b1e86 Venue has show action, not index. Make the ability to schedule an Event more clear. 2016-01-13 13:16:15 +02:00
raluka
df29484317 changed wrong test for ability 2015-09-17 12:13:21 +02:00