Commit graph

475 commits

Author SHA1 Message Date
gotens1211
ec1adbada8 Removed duplicate methods date_range_string and date_string.
Added tests for date_string function

corrections in the test
2017-03-01 15:39:10 +05:30
Ana María Martínez Gómez
3bf8b2472d Merge pull request #1303 from shlok007/ability-spec-resources
Include test for resources in features/ability_spec.rb
2017-02-25 20:51:39 +01:00
Ana
b80aff3cce Add times to Conference
Add start hour and end hour to conference to be able to make the schedule times changeable
2017-02-22 09:09:29 +01:00
Ana María Martínez Gómez
7000e63700 Merge pull request #1297 from siddhantbajaj/Travis_Errors
fixed travis error
2017-02-21 18:14:43 +01:00
shlok007
1ca3147ae0 add resources test in features/ability_spec.rb 2017-02-21 02:01:35 +05:30
Siddhant Bajaj
1255088ff0 fixed travis issues 2017-02-20 23:43:02 +05:30
Ana María Martínez Gómez
f42e4adc45 Merge pull request #1261 from shlok007/resources
Ability to track resources
2017-02-09 10:45:51 +01:00
shlok007
6db2e8abe7 remove input field from admin/resource#index 2017-02-09 01:11:24 +05:30
shlok007
3065766da9 ability to track resources used in conference 2017-02-07 14:58:45 +05:30
gotens1211
4a9c971ec7 Enable Style/SpaceAroundOperators Rubocop
Cleared all the offenses for Style/SpaceAroundOperators

Added a description for the Style/SpaceAroundOperators Rubocop.
2017-02-05 19:43:00 +05:30
Hernán Schmidt
a4ef10cf1b Merge pull request #1118 from rishabhs95/free-ticket
ability to create and purchase free tickets
2017-01-31 14:54:18 +01:00
Rishabh Saxena
241bc89293
repair code reviews 2017-01-29 10:50:43 +05:30
Ana María Martínez Gómez
45c3c73e57 Merge pull request #1255 from shlok007/display-paid-and-unpaid-tickets
Display paid and unpaid tickets in admin/tickets#show
2017-01-26 16:27:24 +01:00
shlok007
d974807134 Display paid and unpaid tickets in admin/tickets#show 2017-01-23 22:37:57 +05:30
Christian Bruckmayer
4a75546e6c Merge pull request #1246 from Ana06/db_cleaning
Improvements in the DatabaseCleaner
2017-01-17 14:22:26 +01:00
Ana María Martínez Gómez
e4104ba2cd Fix the Travis failures in rspec 2017-01-11 10:07:25 +01:00
Ana María Martínez Gómez
7ebf44d1e4 Improvements in the DatabaseCleaner
Move all what is related to the DatabaseCleaner to the
database_cleaner.rb file. Load the seeds only when they have been
deleted and not before every test.
2017-01-11 10:03:27 +01:00
AEtherC0r3
ca442dcb90 Amend version tests to show correct event name
Add scenario for votes
2017-01-10 23:51:32 +02:00
Rishabh Saxena
b9b7a4d97d
remove tickets testing ambiguity 2016-12-20 17:21:50 +05:30
Rishabh Saxena
fe828d24db
conference: refactor code and tests 2016-12-20 17:21:50 +05:30
Rishabh Saxena
53291e25b5
automatically create free ticket with new conf 2016-12-20 17:21:49 +05:30
Rishabh Saxena
b36d4e98e2
ticket_purchase_controller: free ticket routing 2016-12-20 17:21:49 +05:30
Rishabh Saxena
b28be23284
spec/ticket: add tests for purchasing free tickets 2016-12-20 17:21:49 +05:30
Rishabh Saxena
b2f75dd907
spec/tickets: add tests for free ticket creation 2016-12-20 17:21:49 +05:30
differentreality
ea868d4cc7 voting period is open when voting dates are not set 2016-11-24 19:09:35 +02:00
Stella Rouzi
6c39d34322 Merge pull request #1159 from nishanthvijayan/changelog-improvements
Misc improvements to Revision History
2016-11-21 19:21:02 +02:00
richiethomas
daf1f805bd Rename 'ConferenceController' to 'ConferencesController', and 'ProposalController' to 'ProposalsController' 2016-09-30 18:49:44 -04:00
Rishabh Saxena
d1c0c7d97a
registration#delete: retain ticket purchases 2016-09-26 20:57:11 +05:30
Nishanth Vijayan
b982d18bbb Use name/title instead of ID for associated object when showing changes 2016-09-26 17:21:45 +05:30
Stella Rouzi
c48c8afa51 Merge pull request #1161 from Ana06/room-event-schedule
Delete EventSchedules when a Room is deleted
2016-09-06 12:47:51 +03:00
Stella Rouzi
46774748ba Merge pull request #1114 from nishanthvijayan/event-missing-info
Show Event missing info in admin
2016-08-26 18:42:59 +03:00
Hernan Schmidt
393deefcf9 Use a css regex matcher to find campaign entries 2016-08-22 11:23:18 +02:00
Nishanth Vijayan
48828f8930 Display who added commercial for event
Activate versioning for tests

The tests were failing because of the lack of versioning.By default, versioning is off for tests.
As a result, here (app/views/proposal/_form.html.haml L43) commercial,versions.last returns nil as there are no versions.
2016-08-20 14:21:21 +05:30
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
Ana
c5c7cbeab9 Delete EventSchedules when a Room is deleted
We should remove all the EventSchedules that belongs_to a Room when it is deleted. Otherwise both the public and admin schedule would fail.
2016-08-18 16:19:15 +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