[ARVADOS] updated: b52138614767c47770e871b5fa9d4ae9700e26ba

[git at public.curoverse.com]

Summary of changes:
 .../app/assets/javascripts/angular_shim.js         |  4 +-
 .../workbench/app/assets/javascripts/filterable.js | 14 ++++-
 .../app/assets/javascripts/infinite_scroll.js      |  4 +-
 .../app/assets/javascripts/select_modal.js         | 11 +++-
 apps/workbench/app/views/layouts/body.html.erb     |  4 +-
 apps/workbench/test/diagnostics/pipeline_test.rb   |  6 +-
 .../test/integration/application_layout_test.rb    |  6 +-
 .../test/integration/collection_upload_test.rb     | 14 ++---
 .../workbench/test/integration/collections_test.rb | 34 ++---------
 apps/workbench/test/integration/errors_test.rb     |  6 +-
 .../integration/filterable_infinite_scroll_test.rb |  4 +-
 apps/workbench/test/integration/jobs_test.rb       |  6 +-
 apps/workbench/test/integration/logins_test.rb     |  2 +-
 .../test/integration/pipeline_instances_test.rb    | 60 ++++++++++----------
 .../test/integration/pipeline_templates_test.rb    |  4 +-
 apps/workbench/test/integration/projects_test.rb   | 21 +++----
 .../test/integration/report_issue_test.rb          | 21 +++----
 apps/workbench/test/integration/search_box_test.rb |  6 +-
 apps/workbench/test/integration/smoke_test.rb      |  2 +-
 .../test/integration/user_agreements_test.rb       |  4 +-
 .../test/integration/user_manage_account_test.rb   |  6 +-
 .../test/integration/user_profile_test.rb          |  7 +--
 apps/workbench/test/integration/users_test.rb      | 37 ++++--------
 .../test/integration/virtual_machines_test.rb      |  2 +-
 apps/workbench/test/integration/websockets_test.rb |  7 +--
 apps/workbench/test/integration_helper.rb          | 66 ++++++++++++++++++++++
 apps/workbench/test/performance/browsing_test.rb   |  5 +-
 27 files changed, 182 insertions(+), 181 deletions(-)

       via  b52138614767c47770e871b5fa9d4ae9700e26ba (commit)
       via  7c348e5f7b8744a5cbf788c32ad549a8bcb6f3bb (commit)
       via  809a0b4cf662cad17274a03adfec09a04dacf689 (commit)
       via  dea28585b81280c259ec4620f89fde957d272ca4 (commit)
       via  76ab57bbe5363cce5ecc2585f9ad5a4bcff21e0d (commit)
       via  33515b84b0689a984c812c8bc3c0cd663baf9b55 (commit)
       via  9c1021275fb005bac99b2d4abd96290b7d1aa8c8 (commit)
       via  7b5c84ead3ac279088a02ae07f3354d5bba9c9aa (commit)
       via  412fdae03f818a3190f20fd08a6836355ee5f220 (commit)
       via  d43df86ff9b59e73ca3251299303f098946cdc1b (commit)
       via  90cfbd0a9326dcbb9b58c85cbabe4d32596cf665 (commit)
       via  20bf070208aa8284bc8a8071ec2bb65252790170 (commit)
       via  3d5ffcdc1c522d8252470d9ab448e3872e0a3a58 (commit)
      from  a32c4f9997a0c8941b62668c5e59941985359c05 (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 b52138614767c47770e871b5fa9d4ae9700e26ba
Merge: a32c4f9 7c348e5
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Jan 7 12:14:42 2015 -0500

    Merge branch '3021-more-phantomjs' refs #3021


commit 7c348e5f7b8744a5cbf788c32ad549a8bcb6f3bb
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Jan 7 12:13:51 2015 -0500

    3021: Use selenium to land on #Advanced tab.

diff --git a/apps/workbench/test/integration/projects_test.rb b/apps/workbench/test/integration/projects_test.rb
index 4fdcbdb..ce5b47e 100644
--- a/apps/workbench/test/integration/projects_test.rb
+++ b/apps/workbench/test/integration/projects_test.rb
@@ -748,6 +748,7 @@ class ProjectsTest < ActionDispatch::IntegrationTest
   test "first tab loads data when visiting other tab directly" do
     # As of 2014-12-19, the first tab of project#show uses infinite scrolling.
     # Make sure that it loads data even if we visit another tab directly.
+    need_selenium 'to land on specified tab using {url}#Advanced'
     project = api_fixture("groups", "aproject")
     visit(page_with_token("active_trustedclient",
                           "/projects/#{project['uuid']}#Advanced"))

commit 809a0b4cf662cad17274a03adfec09a04dacf689
Merge: dea2858 a32c4f9
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Jan 7 12:14:21 2015 -0500

    3021: Merge branch 'master' into 3021-more-phantomjs


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


hooks/post-receive
--