[ARVADOS] updated: b48e7f0c19f1a7256222c220e938832789492aa3

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/test/integration_helper.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

  discards  145f9bbd75ec7ca507dda5e17a4c756e4d80ab4c (commit)
       via  b48e7f0c19f1a7256222c220e938832789492aa3 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (145f9bbd75ec7ca507dda5e17a4c756e4d80ab4c)
            \
             N -- N -- N (b48e7f0c19f1a7256222c220e938832789492aa3)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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 b48e7f0c19f1a7256222c220e938832789492aa3
Author: Tom Clegg <tom at curoverse.com>
Date:   Sun Feb 8 03:46:34 2015 -0500

    4958: Add tests.

diff --git a/apps/workbench/test/integration/browser_unsupported.rb b/apps/workbench/test/integration/browser_unsupported.rb
new file mode 100644
index 0000000..788907d
--- /dev/null
+++ b/apps/workbench/test/integration/browser_unsupported.rb
@@ -0,0 +1,17 @@
+require 'integration_helper'
+
+class BrowserUnsupported < ActionDispatch::IntegrationTest
+  WARNING_FRAGMENT = 'Your web browser is missing some of the features'
+
+  test 'warning if no File API' do
+    Capybara.current_driver = :poltergeist_without_file_api
+    visit '/'
+    assert_text :visible, WARNING_FRAGMENT
+  end
+
+  test 'no warning if File API' do
+    need_javascript
+    visit '/'
+    assert_no_text :visible, WARNING_FRAGMENT
+  end
+end
diff --git a/apps/workbench/test/integration_helper.rb b/apps/workbench/test/integration_helper.rb
index cb07725..39fdf4b 100644
--- a/apps/workbench/test/integration_helper.rb
+++ b/apps/workbench/test/integration_helper.rb
@@ -4,12 +4,19 @@ require 'capybara/poltergeist'
 require 'uri'
 require 'yaml'
 
+POLTERGEIST_OPTS = {
+  window_size: [1200, 800],
+  phantomjs_options: ['--ignore-ssl-errors=true'],
+  inspector: true,
+}
+
 Capybara.register_driver :poltergeist do |app|
-  Capybara::Poltergeist::Driver.new app, {
-    window_size: [1200, 800],
-    phantomjs_options: ['--ignore-ssl-errors=true'],
-    inspector: true,
-  }
+  Capybara::Poltergeist::Driver.new app, POLTERGEIST_OPTS
+end
+
+Capybara.register_driver :poltergeist_without_file_api do |app|
+  js = File.expand_path '../support/remove_file_api.js', __FILE__
+  Capybara::Poltergeist::Driver.new app, POLTERGEIST_OPTS.merge(extensions: [js])
 end
 
 module WaitForAjax
diff --git a/apps/workbench/test/support/remove_file_api.js b/apps/workbench/test/support/remove_file_api.js
new file mode 100644
index 0000000..0c64df2
--- /dev/null
+++ b/apps/workbench/test/support/remove_file_api.js
@@ -0,0 +1 @@
+window.FileReader = null;

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


hooks/post-receive
--