From 93768ec1fae2054e22d2b7a290ae7f820b8ff77a Mon Sep 17 00:00:00 2001
From: radhika <radhika@curoverse.com>
Date: Fri, 21 Nov 2014 16:42:05 -0500
Subject: [PATCH] 4339: config will be reset after each test, so no need to
 reset it explicitly. also, use assert_selector instead of assert has_link?

---
 .../test/integration/projects_test.rb         | 37 ++++++++-----------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/apps/workbench/test/integration/projects_test.rb b/apps/workbench/test/integration/projects_test.rb
index 2b490ce2a7..e210068199 100644
--- a/apps/workbench/test/integration/projects_test.rb
+++ b/apps/workbench/test/integration/projects_test.rb
@@ -641,28 +641,23 @@ class ProjectsTest < ActionDispatch::IntegrationTest
   test "error while loading tab" do
     original_arvados_v1_base = Rails.configuration.arvados_v1_base
 
-    begin
-      visit page_with_token 'active', '/projects/' + api_fixture('groups')['aproject']['uuid']
-
-      # Point to a bad api server url to generate error
-      Rails.configuration.arvados_v1_base = "https://[100::f]:1/"
-      click_link 'Other objects'
-      within '#Other_objects' do
-        # Error
-        assert page.has_link?('Reload tab', 'Did not find Reload tab button')
-
-        # Now point back to the orig api server and reload tab
-        Rails.configuration.arvados_v1_base = original_arvados_v1_base
-        click_link 'Reload tab'
-        wait_for_ajax
-        assert page.has_no_link?('Reload tab', 'Found unexpected Reload tab button')
-        assert page.has_button?('Selection...', 'Did not find Selection... button')
-        within '.selection-action-container' do
-          assert_selector 'tr[data-kind="arvados#trait"]'
-        end
-      end
-    ensure
+    visit page_with_token 'active', '/projects/' + api_fixture('groups')['aproject']['uuid']
+
+    # Point to a bad api server url to generate error
+    Rails.configuration.arvados_v1_base = "https://[100::f]:1/"
+    click_link 'Other objects'
+    within '#Other_objects' do
+      # Error
+      assert_selector('a', text: 'Reload tab')
+
+      # Now point back to the orig api server and reload tab
       Rails.configuration.arvados_v1_base = original_arvados_v1_base
+      click_link 'Reload tab'
+      assert_no_selector('a', text: 'Reload tab')
+      assert_selector('button', text: 'Selection...')
+      within '.selection-action-container' do
+        assert_selector 'tr[data-kind="arvados#trait"]'
+      end
     end
   end
 
-- 
2.30.2