Merge branch 'master' into test-fix

2017-11-08 09:32:19 -08:00 · 2017-11-08 09:32:19 -08:00 · 20b849d9ce
commit 20b849d9ce
parent 574ac63a05 aeded80a11
11 changed files with 99 additions and 24 deletions
--- a/spec/models/event_spec.rb
+++ b/spec/models/event_spec.rb
@ -362,7 +362,7 @@ describe Event do
        new_event.submitter = submitter
        new_event.speakers = [speaker1, speaker2]

-        expect(new_event.speaker_names).to eq 'user speaker 1 and user speaker 2'
+        expect(new_event.speaker_names).to eq 'user speaker 1, user speaker 2'
      end
    end
  end