Browse Source

Improved tests and set of default calendar.

Martin Edenhofer 9 years ago
parent
commit
f0ed6718e8
2 changed files with 3 additions and 3 deletions
  1. 1 1
      app/models/calendar.rb
  2. 2 2
      test/unit/calendar_test.rb

+ 1 - 1
app/models/calendar.rb

@@ -212,7 +212,7 @@ returns
     Calendar.all.each {|calendar|
       return if calendar.default
     }
-    first = Calendar.first
+    first = Calendar.order(:created_at, :id).limit(1).first
     first.default = true
     first.save
   end

+ 2 - 2
test/unit/calendar_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 
 class CalendarTest < ActiveSupport::TestCase
   test 'default test' do
-
+    Calendar.delete_all
     calendar1 = Calendar.create_or_update(
       name: 'US 1',
       timezone: 'America/Los_Angeles',
@@ -19,7 +19,7 @@ class CalendarTest < ActiveSupport::TestCase
       updated_by_id: 1,
       created_by_id: 1,
     )
-
+    sleep 1
     calendar2 = Calendar.create_or_update(
       name: 'US 2',
       timezone: 'America/Los_Angeles',