From b6dcacaa8a2ad28a0d8a416d864790e170613420 Mon Sep 17 00:00:00 2001 From: Nicolas Florentin Date: Tue, 5 Apr 2016 12:28:42 +0200 Subject: [PATCH] updates tests to use fixtures --- test/integration/availabilities_test.rb | 9 +++------ test/models/availability_test.rb | 6 ++++-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/test/integration/availabilities_test.rb b/test/integration/availabilities_test.rb index aa9213667..94db8f5da 100644 --- a/test/integration/availabilities_test.rb +++ b/test/integration/availabilities_test.rb @@ -1,14 +1,11 @@ class AvailabilitiesTest < ActionDispatch::IntegrationTest setup do - @profile = Profile.create!(gender: true, birthday: 20.years.ago, first_name: "Admin", last_name: "Sleede", phone: "06542868451") - @admin = User.create!(cgu: true, username: 'blabla', email: 'abc@sleede.com', password: 'kikoulol', password_confirmation: 'kikoulol', profile: @profile) - @admin.add_role(:admin) - login_as(@admin, scope: :user) + admin = User.with_role(:admin).first + login_as(admin, scope: :user) end test "return availability by id" do - a = Availability.create!(start_at: Time.now, end_at: 2.hours.from_now, available_type: 'trainings') - + a = Availability.take get "/api/availabilities/#{a.id}" assert_equal 200, response.status diff --git a/test/models/availability_test.rb b/test/models/availability_test.rb index e7b35b388..b14e1c70b 100644 --- a/test/models/availability_test.rb +++ b/test/models/availability_test.rb @@ -2,13 +2,15 @@ require 'test_helper' class AvailabilityTest < ActiveSupport::TestCase test "length must be at least 1h" do - a = Availability.new(start_at: Time.now, end_at: 15.minutes.from_now) + a = Availability.first + a.end_at = a.start_at + 15.minutes assert a.invalid? assert a.errors.key?(:end_at) end test "if type available_type is 'machines' check that there is minimum 1 association" do - a = Availability.new(start_at: Time.now, end_at: 2.hours.from_now, available_type: 'machines') + a = Availability.where(available_type: 'machines').first + a.machines_availabilities.destroy_all assert a.invalid? assert a.errors.key?(:machine_ids) end