VRFS-1668 more test fixes

This commit is contained in:
Brian Smith 2014-05-14 01:51:18 -04:00
parent 212ef168c9
commit 27517c673f
4 changed files with 4 additions and 3 deletions

1
.gitignore vendored
View File

@ -6,3 +6,4 @@
HTML
.DS_Store
coverage
dump.rdb

View File

@ -787,7 +787,7 @@
this.notify = function (message, buttons, noCancel) {
if (!buttons) {
if (noCancel) {
buttons = okButton;
buttons = [okButton];
}
else {
buttons = defaultButtons;

View File

@ -113,7 +113,7 @@ MusicSessionManager < BaseManager
# send "musician joined session" notification only if it's not a band session since there will be a "band joined session" notification
if music_session.band.nil?
Notification.send_musician_session_join(music_session, connection, user)
Notification.send_musician_session_join(music_session, user)
end
end
end

View File

@ -157,7 +157,7 @@ describe "Notification Highlighter", :js => true, :type => :feature, :capybara_f
badge = find("#{NOTIFICATION_PANEL} .badge", text: '1')
badge['class'].include?('highlighted').should == true
find('#notification #btn-reply', text: 'ACCEPT').trigger(:click)
find('#notification #btn-accept', text: 'ACCEPT').trigger(:click)
badge = find("#{NOTIFICATION_PANEL} .badge", text: '0')
badge['class'].include?('highlighted').should == false