Changeset [f132ffe0d1ab2181afd437ec03563e58e9d56597] by Marnen Laibow-Koser
Revision f132ffe0d1ab2181afd437ec03563e58e9d56597,
committed by Marnen Laibow-Koser
· September 8th, 2011 @ 09:51 AM
Merge branch 'factory-girl' into 52-rails3
https://github.com/marnen/quorum2/commit/f132ffe0d1ab2181afd437ec03...
29 changed files
-
A
spec/factories.rb -
R
spec/support/blueprints.rb -
R
spec/support/machinist.rb -
M
.autotest -
M
Gemfile -
M
Gemfile.lock -
M
features/step_definitions/calendar_steps.rb -
M
features/step_definitions/event_steps.rb -
M
features/step_definitions/user_steps.rb -
M
spec/controllers/admin_controller_spec.rb -
M
spec/controllers/application_spec.rb -
M
spec/controllers/calendars_controller_spec.rb -
M
spec/controllers/events_controller_spec.rb -
M
spec/controllers/permissions_controller_spec.rb -
M
spec/controllers/user_sessions_controller_spec.rb -
M
spec/controllers/users_controller_spec.rb -
M
spec/helpers/events_helper_spec.rb -
M
spec/models/event_spec.rb -
M
spec/models/permission_spec.rb -
M
spec/models/user_spec.rb -
M
spec/support/authlogic.rb -
M
spec/views/calendars/users.html.haml_spec.rb -
M
spec/views/events/_attendance.html.haml_spec.rb -
M
spec/views/events/_event.html.haml_spec.rb -
M
spec/views/events/ical.ics.erb_spec.rb -
M
spec/views/events/index.html.haml_spec.rb -
M
spec/views/events/map.html.haml_spec.rb -
M
spec/views/events/new.html.haml_spec.rb -
M
spec/views/events/show.html.haml_spec.rb