Merge pull request #288 from lsa-mis/fix-notes-test

fix notes spec because of trix update

spec/system/notes_spec.rb

@@ -25,7 +25,7 @@
     it 'displays an error' do
       visit "rooms/#{room.id}"
       click_on "Add Note"
-      expect(page).to have_content("Content can't be blank")
+      expect(page).to have_content("Content can't be blank").or(have_content("Please fill out this field"))
     end
   end