Skip to content

Commit

Permalink
Removed placeholder text for maintenance window (bigbluebutton#1049)
Browse files Browse the repository at this point in the history
Co-authored-by: Jesus Federico <[email protected]>
  • Loading branch information
farhatahmad and jfederico authored Mar 20, 2020
1 parent b23c1d1 commit 7fa7d2f
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 9 deletions.
2 changes: 1 addition & 1 deletion app/controllers/application_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ def maintenance_mode?
end
if Rails.configuration.maintenance_window.present?
unless cookies[:maintenance_window] == Rails.configuration.maintenance_window
flash.now[:maintenance] = I18n.t("maintenance.window_alert", date: Rails.configuration.maintenance_window)
flash.now[:maintenance] = Rails.configuration.maintenance_window
end
end
end
Expand Down
8 changes: 0 additions & 8 deletions spec/models/room_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,4 @@
expect(@room.owned_by?(create(:user))).to be false
end
end

context "#notify_waiting" do
it "should broadcast to waiting channel with started action" do
expect do
@room.notify_waiting
end.to have_broadcasted_to("#{@room.uid}_waiting_channel").with(a_hash_including(action: "started"))
end
end
end

0 comments on commit 7fa7d2f

Please sign in to comment.