Commit graph

442 commits

Author SHA1 Message Date
Hernan Schmidt
393deefcf9 Use a css regex matcher to find campaign entries 2016-08-22 11:23:18 +02:00
Hernan Schmidt
4d6868d9bb Fix conference serializer spec to work with MySQL 2016-08-18 18:34:50 +02:00
Hernan Schmidt
9eb4ac2738 Fix campaign features to work with MySQL 2016-08-18 18:32:41 +02:00
Hernan Schmidt
686e41c3d0 Fix proposal controller specs to work with MySQL 2016-08-18 18:32:41 +02:00
Hernan Schmidt
a6d4d51b03 Fix model specs to work with MySQL 2016-08-18 18:32:41 +02:00
Hernan Schmidt
baa5894c38 Don't use DBCleaner inside tests 2016-08-18 18:32:41 +02:00
Hernan Schmidt
244172a9bc Clean up DatabaseCleaner usage 2016-08-18 18:32:06 +02:00
Hernán Schmidt
32019a11e1 Merge pull request #1108 from rishabhs95/stripe
Online payment feature - direct stripe integration
2016-08-18 16:04:11 +02:00
Rishabh Saxena
4152cb242c run stripe feature test only if key is set 2016-08-17 23:57:40 +05:30
charliequinn
ef9ba3b981 Added specs for ApplicationHelper.show_time
- refactor of code to use divmod and handle decimal number parameter
- return '0 h 0 min' if length blank
2016-08-17 13:55:29 +01:00
Rishabh Saxena
cc09dd76ba support/external_request: only allow stripe 2016-08-17 12:25:49 +05:30
Rishabh Saxena
43ac7742a1 travis: provide Stripe API keys 2016-08-16 23:01:28 +05:30
Stella Rouzi
9c5fd18c3e Merge pull request #1097 from shlok007/manual_confirmation
Ability to confirm users by admin
2016-08-16 13:43:27 +03:00
shlok007
c50e8c0466 Implemented ability of admins to manually confirm users 2016-08-16 02:23:41 -04:00
charliequinn
89d45f62a0 Bug fix nil parameter ApplicationHelper.markdown
Added specs for nil value parameter and header markdown
2016-08-16 00:33:32 +01:00
Rishabh Saxena
75e11223d2 spec/feature: add stripe integration tests 2016-08-16 00:46:11 +05:30
Stella Rouzi
86ba2d005e Merge pull request #1019 from nishanthvijayan/changelog
Changelog/Revision History page
2016-08-15 14:16:12 +03:00
Rishabh Saxena
6bd2e5e335 refactor tests 2016-08-15 10:59:36 +05:30
Rishabh Saxena
a78804b94d add more tests to check Stripe exceptions 2016-08-15 10:59:36 +05:30
Rishabh Saxena
5c21d1c4d9 add Payment#purchase tests 2016-08-15 10:59:35 +05:30
Rishabh Saxena
a9ab1186f8 change rails initialisation.
repair abilities. add ticket purchasing check.
2016-08-15 10:59:35 +05:30
Rishabh Saxena
72ef33cbe6 remove stripe#customer creation.
remove amount validation.
2016-08-15 10:59:35 +05:30
Rishabh Saxena
1f9338735c improve Stripe error rescue. modify tests. 2016-08-15 10:59:34 +05:30
Rishabh Saxena
52c30af642 generalise application icon for Stripe iFrame 2016-08-15 10:59:34 +05:30
Rishabh Saxena
7b23018a06 add payment tests 2016-08-15 10:59:34 +05:30
Rishabh Saxena
a5bb038f61 modify tests for changed payment flow 2016-08-15 10:59:34 +05:30
Henne Vogelsang
2b4bf2fff7 Merge pull request #1138 from charliequinn/increase-tests-conference-registrations-controller
Specs added ConferenceRegistrationsController#new
2016-08-12 13:42:24 +02:00
Ana
eee4e4f22c Add markdown to users biography
Closes https://github.com/openSUSE/osem/issues/1090
Closes https://github.com/openSUSE/osem/issues/701
2016-08-12 11:38:28 +02:00
Ana
72cd463dc7 Add markdown to events abstract 2016-08-12 11:38:28 +02:00
Nishanth Vijayan
fb03a87a87 Feature test for Revision History 2016-08-12 13:35:56 +05:30
Nishanth Vijayan
a45e537bac Setup basic Revision History page
Sets up paper_trail tracking in important models

and add conference_id to versions for storing conference_id
of conference related objects  as metadata.This will help in querying
for versions related to conferences.

Fix issues with factories & event types initialization.Import paper_trail testing helpers
Fix bug: Creating an event creates a useless version with event update

Add revert and view changes features to revision history
2016-08-12 13:35:56 +05:30
charliequinn
df8517b011 Specs added ConferenceRegistrationsController#new
- Increased test coverage with addition of specs to cover :new method of
  ConferenceRegistrationsController
2016-08-11 23:54:21 +01:00
Ana
1989a33da1 Test namings
Test namings in event_schedules and schedules controllers.
2016-08-11 15:11:27 +02:00
Ana
8975df6a6b Event schedules controller tests improved 2016-08-11 15:11:27 +02:00
Ana
a1c7f67735 Render errors in JSON in the schedule correctly 2016-08-11 15:11:27 +02:00
Ana
e8261d41bc Improve Error messages
- Improve error messages in event schedules, schedules and program controller.
- Two respond_to blocks in the update method of program controller.
2016-08-11 15:11:27 +02:00
Ana
c687c1072e Add event schedules and schedules controller specs 2016-08-11 15:11:27 +02:00
Ana
13bcee485e Has a valid factory test for event schedule
Has a valid factory test introduced for event schedule
2016-08-11 15:11:27 +02:00
Ana
29b920d746 Corrections in SchedulesController
- Controler file name pluralized
- Load and authorization fixed and improved
- Consider that save can fail in create action
- Eliminate unnecessary if in update action
- Ability and tests related to the schedules link in the admin sidebar fixed
2016-08-11 15:11:27 +02:00
Ana
a578167cf5 Event model improvements
- Drop selected_event_schedule function
- Rename scheduled_room and scheduled_start_time to room and time as if there is no selected_schedule, the event is not scheduled.
2016-08-11 15:11:27 +02:00
Ana
5001848af7 Introduce an Admin::EventScheduleController
- move SchedulesController#update action
- split it into an #create/#update and #destroy action and use these actions in the JS code
2016-08-11 15:11:27 +02:00
Ana
a394293500 Do not use JS to initialize the schedule
- Only use JS for the drag&drop functionality and to the set/alter the time and rooms of the EventSchedule object.

- Introduce has_many :events, through: :event_schedules association to get unscheduled event easily
2016-08-11 15:11:27 +02:00
Ana
71dab6b79c SchedulesController introduced
The actions #schedule and #events were moved from conference controller to the new controller
2016-08-11 15:11:27 +02:00
Ana
b037a5eb7c Load and authorize schedule in ScheduleController 2016-08-11 15:11:27 +02:00
Ana
42848f929b Several schedules in the backend && routes changed
- Introduce plural resources for Schedule in routes.rb
- Introduce #index and #create actions for ScheduleController
- Make it possible to set a schedule as selected_schedule
2016-08-11 15:11:27 +02:00
Ana
3897ec79ca Repeated sentence moved to a function
program.selected_schedule.event_schedules.order(start_time: :asc) was repeated several times and it has been moved to conference#selected_event_schedules
2016-08-11 15:11:27 +02:00
Ana
beb17165a2 Introduce an association for the selected_schedule
Association in Program fot the selected_schedule
2016-08-11 15:11:27 +02:00
Ana
0b26ed5c35 EventSchedule validations
event, schedule, room and start_time are mandatory in EventSchedule.
2016-08-11 15:11:27 +02:00
Ana
354e15a76d Public schedule adapted to the new relations
Public schedule and all events adapted to the new relations and models to allow having several schedules in the admin shcedule.
2016-08-11 15:11:27 +02:00
Ana
dfd64a4510 Integrate the schedule in the admin interface
Integrate the schedule in the admin interface while adapting it to the new associations and models.
2016-08-11 15:06:52 +02:00