4084: Ignore bubbling arv-log-event events, just process each once at the original...

[arvados.git] / apps / workbench / test / integration / websockets_test.rb

diff --git a/apps/workbench/test/integration/websockets_test.rb b/apps/workbench/test/integration/websockets_test.rb
index 87dd83518785c06b0bb42bf300adbf1106f6c8b9..65784af523e72b3cc04b35409b463ce37742d624 100644 (file)
--- a/apps/workbench/test/integration/websockets_test.rb
+++ b/apps/workbench/test/integration/websockets_test.rb
@@ -11,32 +11,32 @@ class WebsocketTest < ActionDispatch::IntegrationTest
   end
 
   test "test page" do
-    visit(page_with_token("active", "/websockets"))
+    visit(page_with_token("admin", "/websockets"))
     fill_in("websocket-message-content", :with => "Stuff")
     click_button("Send")
-    assert page.has_text? '"status":400'
+    assert_text '"status":400'
   end
 
   test "test live logging" do
-    visit(page_with_token("active", "/pipeline_instances/zzzzz-d1hrv-9fm8l10i9z2kqc6"))
+    visit(page_with_token("admin", "/pipeline_instances/zzzzz-d1hrv-9fm8l10i9z2kqc6"))
     click_link("Log")
-    assert page.has_no_text? '123 hello'
+    assert_no_text '123 hello'
 
     api = ArvadosApiClient.new
 
-    Thread.current[:arvados_api_token] = @@API_AUTHS["active"]['api_token']
+    Thread.current[:arvados_api_token] = @@API_AUTHS["admin"]['api_token']
     api.api("logs", "", {log: {
                 object_uuid: "zzzzz-d1hrv-9fm8l10i9z2kqc6",
                 event_type: "stderr",
                 properties: {"text" => "123 hello"}}})
-    assert page.has_text? '123 hello'
+    assert_text '123 hello'
     Thread.current[:arvados_api_token] = nil
   end
 
   test "test live logging scrolling" do
-    visit(page_with_token("active", "/pipeline_instances/zzzzz-d1hrv-9fm8l10i9z2kqc6"))
+    visit(page_with_token("admin", "/pipeline_instances/zzzzz-d1hrv-9fm8l10i9z2kqc6"))
     click_link("Log")
-    assert page.has_no_text? '123 hello'
+    assert_no_text '123 hello'
 
     api = ArvadosApiClient.new
 
@@ -45,12 +45,12 @@ class WebsocketTest < ActionDispatch::IntegrationTest
       text << "#{i} hello\n"
     end
 
-    Thread.current[:arvados_api_token] = @@API_AUTHS["active"]['api_token']
+    Thread.current[:arvados_api_token] = @@API_AUTHS["admin"]['api_token']
     api.api("logs", "", {log: {
                 object_uuid: "zzzzz-d1hrv-9fm8l10i9z2kqc6",
                 event_type: "stderr",
                 properties: {"text" => text}}})
-    assert page.has_text? '1000 hello'
+    assert_text '1000 hello'
 
     # First test that when we're already at the bottom of the page, it scrolls down
     # when a new line is added.
@@ -60,7 +60,7 @@ class WebsocketTest < ActionDispatch::IntegrationTest
                 object_uuid: "zzzzz-d1hrv-9fm8l10i9z2kqc6",
                 event_type: "stderr",
                 properties: {"text" => "1001 hello\n"}}})
-    assert page.has_text? '1001 hello'
+    assert_text '1001 hello'
 
     # Check that new value of scrollTop is greater than the old one
     assert page.evaluate_script("$('#pipeline_event_log_div').scrollTop()") > old_top
@@ -73,7 +73,7 @@ class WebsocketTest < ActionDispatch::IntegrationTest
                 object_uuid: "zzzzz-d1hrv-9fm8l10i9z2kqc6",
                 event_type: "stderr",
                 properties: {"text" => "1002 hello\n"}}})
-    assert page.has_text? '1002 hello'
+    assert_text '1002 hello'
 
     # Check that we haven't changed scroll position
     assert_equal 30, page.evaluate_script("$('#pipeline_event_log_div').scrollTop()")
@@ -82,7 +82,7 @@ class WebsocketTest < ActionDispatch::IntegrationTest
   end
 
   test "pipeline instance arv-refresh-on-log-event" do
-    Thread.current[:arvados_api_token] = @@API_AUTHS["active"]['api_token']
+    Thread.current[:arvados_api_token] = @@API_AUTHS["admin"]['api_token']
     # Do something and check that the pane reloads.
     p = PipelineInstance.create({state: "RunningOnServer",
                                   components: {
@@ -93,49 +93,49 @@ class WebsocketTest < ActionDispatch::IntegrationTest
                                   }
                                 })
 
-    visit(page_with_token("active", "/pipeline_instances/#{p.uuid}"))
+    visit(page_with_token("admin", "/pipeline_instances/#{p.uuid}"))
 
-    assert page.has_text? 'Active'
+    assert_text 'Active'
     assert page.has_link? 'Pause'
-    assert page.has_no_text? 'Complete'
+    assert_no_text 'Complete'
     assert page.has_no_link? 'Re-run with latest'
 
     p.state = "Complete"
     p.save!
 
-    assert page.has_no_text? 'Active'
+    assert_no_text 'Active'
     assert page.has_no_link? 'Pause'
-    assert page.has_text? 'Complete'
+    assert_text 'Complete'
     assert page.has_link? 'Re-run with latest'
 
     Thread.current[:arvados_api_token] = nil
   end
 
   test "job arv-refresh-on-log-event" do
-    Thread.current[:arvados_api_token] = @@API_AUTHS["active"]['api_token']
+    Thread.current[:arvados_api_token] = @@API_AUTHS["admin"]['api_token']
     # Do something and check that the pane reloads.
     p = Job.where(uuid: api_fixture('jobs')['running_will_be_completed']['uuid']).results.first
 
-    visit(page_with_token("active", "/jobs/#{p.uuid}"))
+    visit(page_with_token("admin", "/jobs/#{p.uuid}"))
 
-    assert page.has_no_text? 'complete'
-    assert page.has_no_text? 'Re-run same version'
+    assert_no_text 'complete'
+    assert_no_text 'Re-run same version'
 
     p.state = "Complete"
     p.save!
 
-    assert page.has_text? 'complete'
-    assert page.has_text? 'Re-run same version'
+    assert_text 'complete'
+    assert_text 'Re-run same version'
 
     Thread.current[:arvados_api_token] = nil
   end
 
   test "dashboard arv-refresh-on-log-event" do
-    Thread.current[:arvados_api_token] = @@API_AUTHS["active"]['api_token']
+    Thread.current[:arvados_api_token] = @@API_AUTHS["admin"]['api_token']
 
-    visit(page_with_token("active", "/"))
+    visit(page_with_token("admin", "/"))
 
-    assert page.has_no_text? 'test dashboard arv-refresh-on-log-event'
+    assert_no_text 'test dashboard arv-refresh-on-log-event'
 
     # Do something and check that the pane reloads.
     p = PipelineInstance.create({state: "RunningOnServer",
@@ -144,7 +144,7 @@ class WebsocketTest < ActionDispatch::IntegrationTest
                                   }
                                 })
 
-    assert page.has_text? 'test dashboard arv-refresh-on-log-event'
+    assert_text 'test dashboard arv-refresh-on-log-event'
 
     Thread.current[:arvados_api_token] = nil
   end