Upstream sync

spec/controllers/public/broadcasts_controller_spec.rb

@@ -8,7 +8,7 @@ RSpec.describe Public::BroadcastsController, type: :controller do
   let(:project) { create(:project, account: user.primary_account) }
 
   before do
-    allow(MuxLiveStream).to receive(:new).and_return(double(id: "id", key: "key", playback_id: "playback_id"))
+    stub_mux_live_stream
   end
 
   describe "#show" do
@@ -81,6 +81,16 @@ RSpec.describe Public::BroadcastsController, type: :controller do
         expect(response.body).to have_selector(".dropdown-menu a.dropdown-item", text: recording.download_file_name)
       end
     end
+
+    context 'when video conference url has been overriden' do
+      let(:broadcast) { create(:broadcast, project: project, video_conference_url_override: 'https://test.com') }
+
+      it 'uses the override url for the video conference button' do
+        get :show, params: { token: broadcast.token }
+        
+        expect(response.body).to have_link("Video Conference", href: 'https://test.com')
+      end
+    end
   end
 
   describe "#update" do