[ARVADOS] updated: bff45b8c8eba53aeedcc62fcd0021e7807409972

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/test/integration/errors_test.rb | 34 +++++++++++++++++++++++---
 docker/build_tools/Makefile                    |  5 ++--
 2 files changed, 33 insertions(+), 6 deletions(-)

       via  bff45b8c8eba53aeedcc62fcd0021e7807409972 (commit)
       via  9e01d65e64173caf29ef750c7d29c2b3d424c4ab (commit)
       via  17e388d6515cfd7f3bb527c982b925270b426419 (commit)
      from  c8a75fee345211d04894d749a7d8bfcd0925c9f1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit bff45b8c8eba53aeedcc62fcd0021e7807409972
Author: radhika <radhika at curoverse.com>
Date:   Fri Aug 15 20:15:25 2014 -0400

    3112: improve errors test to exercise the report issue button.

diff --git a/apps/workbench/test/integration/errors_test.rb b/apps/workbench/test/integration/errors_test.rb
index 3f00f0e..631de5e 100644
--- a/apps/workbench/test/integration/errors_test.rb
+++ b/apps/workbench/test/integration/errors_test.rb
@@ -1,6 +1,14 @@
 require 'integration_helper'
+require 'selenium-webdriver'
+require 'headless'
 
 class ErrorsTest < ActionDispatch::IntegrationTest
+  setup do
+    headless = Headless.new
+    headless.start
+    Capybara.current_driver = :selenium
+  end
+
   BAD_UUID = "ffffffffffffffffffffffffffffffff+0"
 
   test "error page renders user navigation" do
@@ -85,11 +93,31 @@ class ErrorsTest < ActionDispatch::IntegrationTest
 
       visit page_with_token("active")
 
-      assert(page.has_text?(/fiddlesticks/i),
-             "Not on an error page after making an SSH key out of scope")
+      assert(page.has_text?(/fiddlesticks/i), 'Expected to be in error page')
+
+      # reset api server base config to let the popup rendering to work
+      Rails.configuration.arvados_v1_base = original_arvados_v1_base
 
       # check the "Report problem" button
-      assert page.has_link? 'Report problem'
+      assert page.has_link? 'Report problem', 'Report problem link not found'
+
+      click_link 'Report problem'
+      within '.modal-content' do
+        assert page.has_text?('Report a problem'), 'Report a problem text not found'
+        assert page.has_no_text?('Version / debugging info'), 'Version / debugging info is not expected'
+        assert page.has_text?('Server version'), 'Server version  text not found'
+        assert page.has_text?('Server restarted at'), 'Server restarted at text not found'
+        assert page.has_text?('Found a problem?'), 'Found a problem text not found'
+        assert page.has_button?('Report issue'), 'Report issue button not found'
+        assert page.has_button?('Cancel'), 'Cancel button not found'
+
+        # enter a report text and click on report
+        page.find_field('report_issue_text').set 'my test report text'
+        click_button 'Report issue'
+      end
+
+      # out of the popup now and should be back in the error page
+      assert(page.has_text?(/fiddlesticks/i), 'Expected to be in error page')
     ensure
       Rails.configuration.arvados_v1_base = original_arvados_v1_base
     end

commit 9e01d65e64173caf29ef750c7d29c2b3d424c4ab
Merge: c8a75fe 17e388d
Author: radhika <radhika at curoverse.com>
Date:   Fri Aug 15 19:47:18 2014 -0400

    Merge branch 'master' into 3112-report-bug


-----------------------------------------------------------------------


hooks/post-receive
--