Merge branch 'test_fix' into 'master'

Fix broken spec related to MySQL and fractional seconds support. See merge request !1973

Merge branch 'test_fix' into 'master'
843df4ed · Valery Sizov · ca7e31c4 · f94afdbd · 843df4ed
Commit 843df4ed authored Dec 03, 2015 by Valery Sizov
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

project_spec.rb spec/models/project_spec.rb +3 -1

No files found.
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -444,7 +444,9 @@ describe Project do

      before do
        2.times do
-          create(:note_on_commit, project: project2, created_at: date)
+          # Little fix for special issue related to Fractional Seconds support for MySQL.
+          # See: https://github.com/rails/rails/pull/14359/files
+          create(:note_on_commit, project: project2, created_at: date + 1)
        end
      end