Commit graph

305 commits

Author SHA1 Message Date
Nishanth Vijayan
864245fec2 Add specs for api/v1/rooms_controller & api/v1/tracks_controller
and cleanup api/v1/tracks and api/v1/rooms controllers
2016-03-15 00:57:15 +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
7b3208b43b Tests for room controller 2016-03-07 19:19:48 +05:30
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
c219ffc9a3 Tests for Admin::Targets controller
Authorization in index action is not needed.
Fix failed delete flash error message.
2016-03-06 10:46:04 +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
Henne Vogelsang
af168f0f55 Merge pull request #700 from differentreality/roles_updated
Roles updated
2016-03-04 17:11:56 +01:00
Aditya Prakash
6301072484 Add webmock for external requests in tests
external_request.rb needs to be required before lint is run.
2016-03-02 21:15:29 +05:30
Aditya Prakash
640be7497f Add config to allow running FactoryGirl lint before suit
By default the lint will be run before every test suit.
Set it to false in config.yml if you would rather just use the rake
task: `bundle exec rake factory_girl:lint`
2016-03-02 21:15:29 +05:30
Aditya Prakash
f84150362b Move FactoryGirl.lint to rake task
This significantly improves start time of tests. It is also the recommended
way: https://github.com/thoughtbot/factory_girl/blob/master/GETTING_STARTED.md#linting-factories

Read more at: https://github.com/thoughtbot/factory_girl/issues/772
2016-03-02 21:15:28 +05:30
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
Henne Vogelsang
e2fb83146a Merge pull request #768 from hennevogel/rubocop
Update rubocop todo file
2016-02-18 14:08:04 +01: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
Henne Vogelsang
919c69f7ae Fix new rubocop offense 2016-02-08 14:57:23 +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
Christian Bruckmayer
28e55f3f50 Merge pull request #737 from ChrisBr/commercial_new
Simplify adding commercials to conference and event
2016-01-21 20:29:03 +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
Stella Rouzi
17a1c0e87c fix hakiri issue 2016-01-21 20:19:37 +02: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
Stella Rouzi
355ecc0ac6 Introduce strong parameters 2015-12-23 11:36:50 +02:00
Henne Vogelsang
6e9a8bbd59 Merge pull request #717 from AndrewKvalheim/shoulda-spring
Use recommended method for installing Shoulda Matchers with Spring.
2015-10-27 09:09:10 +01:00
Andrew Kvalheim
e593c1d1fb Apply recommendation from thoughtbot/shoulda-matchers@a5623e7. 2015-10-14 09:26:36 -07:00
raluka
9eb47bd3f0 merged from upstream 2015-10-14 16:02:40 +02:00
raluka
3d57203727 added more consistency for email_settings 2015-10-14 15:34:23 +02:00
Stella Rouzi
759aa54689 Syntax style + code groomming 2015-10-06 14:15:38 +03:00
raluka
0c4b0b4ac1 Refactored EmailSetting incosistency. Fixes #603 2015-10-06 11:32:40 +02:00
raluka
1fb1071feb moved comment instance into before block 2015-09-17 12:13:22 +02:00
raluka
37339dccc1 refactored comments_controller tests; fixed access to Administration link into user_menu view 2015-09-17 12:13:22 +02:00
raluka
a9a43d726f WIP created tests for comments_controller.rb 2015-09-17 12:13:22 +02:00
raluka
21c10166ec added test file for comments_controller WIP 2015-09-17 12:13:22 +02:00
raluka
df29484317 changed wrong test for ability 2015-09-17 12:13:21 +02:00
raluka
e10a2491d3 created tests for user ability 2015-09-17 12:13:21 +02:00
raluka
b780996128 created comments with FactoryGirl 2015-09-17 12:13:21 +02:00
Henne Vogelsang
68efa06696 Merge pull request #660 from bgeuken/conference_model
Conference model
2015-07-02 16:28:06 +02:00
Stella Rouzi
8567a997cb Merge pull request #679 from differentreality/switch
Rework bootstrapSwitch
2015-07-02 13:08:16 +03:00
Stella Rouzi
848aa5f12a Small test addition for #687 2015-06-17 22:04:43 +03:00