diff --git a/web/app/assets/javascripts/JamServer.js b/web/app/assets/javascripts/JamServer.js index 3c1f5d764..73c326f0a 100644 --- a/web/app/assets/javascripts/JamServer.js +++ b/web/app/assets/javascripts/JamServer.js @@ -479,7 +479,7 @@ var params = { channel_id: channelId, token: $.cookie("remember_token"), - client_type: isClientMode() ? context.JK.clientType : 'latency_tester', + client_type: isClientMode() ? context.JK.clientType() : 'latency_tester', client_id: isClientMode() ? (gon.global.env == "development" ? $.cookie('client_id') : null): context.jamClient.clientID } diff --git a/web/app/views/clients/latency_tester.html.haml b/web/app/views/clients/latency_tester.html.haml index e64a92259..027335c65 100644 --- a/web/app/views/clients/latency_tester.html.haml +++ b/web/app/views/clients/latency_tester.html.haml @@ -1,5 +1,5 @@ -= render :partial => "banner" -= render :partial => "clients/banners/disconnected" += render :partial => "dialogs/banner" += render :partial => "dialogs/banners/disconnected" = render :partial => "jamServer" :javascript diff --git a/web/spec/features/landing_spec.rb b/web/spec/features/landing_spec.rb index ff192b975..1126ee01b 100644 --- a/web/spec/features/landing_spec.rb +++ b/web/spec/features/landing_spec.rb @@ -5,10 +5,6 @@ describe "Landing", :js => true, :type => :feature, :capybara_feature => true do subject { page } before(:all) do - Capybara.javascript_driver = :poltergeist - Capybara.current_driver = Capybara.javascript_driver - Capybara.default_wait_time = 10 - FactoryGirl.create(:artifact_update, :product => 'JamClient/Win32') FactoryGirl.create(:artifact_update, :product => 'JamClient/MacOSX') end diff --git a/web/spec/features/latency_tester_spec.rb b/web/spec/features/latency_tester_spec.rb new file mode 100644 index 000000000..6a93e6cb1 --- /dev/null +++ b/web/spec/features/latency_tester_spec.rb @@ -0,0 +1,12 @@ +require 'spec_helper' + +describe "Latency Tester", :js => true, :type => :feature, :capybara_feature => true do + + subject { page } + + before(:each) do + + end + +end +