Commit graph

391 commits

Author SHA1 Message Date
Ana
71b39bb612 creation of my_conference repeated in ability_spec
my_conference is created several times in ability_spec but it is not necessary.
2016-07-29 19:58:11 +02:00
Henne Vogelsang
5edc6123f4 Merge pull request #987 from differentreality/blind_voting
Blind voting
2016-07-25 15:49:01 +02:00
Stella Rouzi
59eeb7edbd Enable blind voting 2016-07-22 12:21:54 +03:00
Ana
a0fc9dd950 Default value for length in as_json fixed
The default value for length in as_json should be a multiple of EventType::LENGTH_STEP.
2016-07-18 11:45:59 +02:00
Christian Bruckmayer
28f0973fc4 Merge pull request #1079 from Ana06/suggest_track_color
Different colors for new tracks, types and levels
2016-07-11 15:10:26 +02:00
Ana
8d9bb56f06 Hexadecimal color changed to capital letters
The default colors in event_types and difficulty levels are in capital letters and the ones that comes from the color picker were not. Now colors are capitalized before saving the track, level or type. A rake task has also been created to capitalize color from old tracks, levels or types.
2016-07-11 13:46:02 +02:00
Ana
0deaf1abc7 Different colors for new tracks, types and levels
Every time a new track, event type or difficulty level is created, the color picker has a different color by default.

Closes https://github.com/openSUSE/osem/issues/1077
2016-07-11 13:46:01 +02:00
Arun Kumar
0675572e05
Modify conference registration to a singular resource 2016-07-05 01:15:32 +05:30
Stella Rouzi
15076b11f1 XML export fix tests. Add not nil room for scheduled events. 2016-06-20 21:05:08 +03:00
Henne Vogelsang
b1b8703753 Merge pull request #1038 from differentreality/xml_export
XML export
2016-06-20 15:01:12 +02:00
Stella Rouzi
8a595e6284 add test 2016-06-15 20:54:51 +03:00
Rishabh Saxena
c802bd95b9 change datepicker id to place correct constraints 2016-06-15 20:48:55 +05:30
Henne Vogelsang
dcae196d2b Merge pull request #905 from Ana06/languages
Languages
2016-06-15 16:55:12 +02:00
Ana
6c87995050 Configure language of events 2016-06-03 14:09:37 +02:00
Ana
74e889a046 length test in EventType fixed 2016-06-01 13:09:45 +02:00
Ana
55c41810b2 Limit event types lenght 2016-05-31 16:51:12 +02:00
Ana
f648b8731a Wrong test: proposal cannot be rated 2016-05-27 00:45:42 +02:00
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
084ee7ef43 Give a bit more demo info in the conference description 2016-05-03 16:25:39 +02:00
Henne Vogelsang
5b20c992ae Let activerecord handle the picture upload in factories 2016-05-03 16:25:39 +02:00
Henne Vogelsang
4c4918a7a7 Somehow the :venues factory creates a dangling Conference
disabling for now
2016-05-03 16:25:39 +02:00
Henne Vogelsang
45bd31fad0 Escape HTML some factory strings 2016-05-03 16:25:07 +02:00
Henne Vogelsang
8fa92b72d1 HTML escape Faker::Hipster.paragraph 2016-05-02 16:06:32 +02:00
Henne Vogelsang
40562334c7 Make rubocop happy again 2016-05-02 16:06:32 +02:00
Henne Vogelsang
73ce49de25 Use dynamic fake data in the spec 2016-05-02 16:06:32 +02:00
Henne Vogelsang
1c7becb69a use :full_conference factory in the conference view specs 2016-05-02 16:06:32 +02:00
Henne Vogelsang
dd5796bd34 Fix saving feature failures to tmp/capybara 2016-05-02 16:06:32 +02:00
Henne Vogelsang
77e0340387 Make use of fake data in factories 2016-05-02 16:06:27 +02:00
Henne Vogelsang
bd36ce0fb2 Switch logic for linting factories
Only if you set the environment variable OSEM_FACTORY_LINT
to 'false' it won't lint.
2016-04-29 16:36:47 +02:00
Henne Vogelsang
8fc57e34c9 Adapt the spec 2016-04-27 17:55:24 +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
Henne Vogelsang
aabbd35063 Merge pull request #932 from hennevogel/bugfix_email_settings
Fix email notifications
2016-04-26 14:33:43 +02:00
Henne Vogelsang
9e07212cb5 Merge pull request #967 from sonalkr132/sponsers
Splash page sponsers section style improvement
2016-04-26 14:31:48 +02: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
Henne Vogelsang
20d908e085 Adapt the mailbot spec to the last changes 2016-04-22 14:53:10 +02:00
Aditya Prakash
d662ebd252 Remove sponsorship level from view and test 2016-04-21 21:22:14 +05:30
Christian Bruckmayer
647a40be63 Prettify sponsors section 2016-04-21 19:51:24 +05:30
Henne Vogelsang
14011f8828 Fix email notifications 2016-04-20 16:22:29 +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
Aditya Prakash
7e04a267cb Fix get_roles method of User model
Previous implementation was associating resources with all
the roles regardless of user role in the resource. ie:
if user is cfp member of conf1, the method was returning:
{ organizer => conf1,
  cfp => conf1,
  Info Desk => conf1,
  Volunteers Coordinator => conf1
}
2016-04-17 14:11:09 +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
Nishanth Vijayan
ab339fadb0 Fix typos: volunteer_coordinator to volunteers_coordinator 2016-04-09 03:50:27 +05:30
Christian Bruckmayer
86449eea67 Merge pull request #926 from sonalkr132/mailer-tests
Mailer fixes and tests
2016-04-08 11:43:03 -06:00