[ARVADOS] updated: ddb83a220cd6f3b62171c3c374c58e553d82a5d6

[git at public.curoverse.com]

Summary of changes:
 .../controllers/application_controller_test.rb     |  16 +++
 .../controllers/collections_controller_test.rb     |  53 ++++++++++
 .../test/controllers/projects_controller_test.rb   |  64 ++++++++++++
 .../test/controllers/users_controller_test.rb      |  45 +++++++++
 .../test/integration/anonymous_access_test.rb      |  10 --
 .../test/integration/collection_upload_test.rb     |   7 --
 .../workbench/test/integration/collections_test.rb |  45 ---------
 apps/workbench/test/integration/projects_test.rb   | 109 ---------------------
 apps/workbench/test/integration/users_test.rb      |  40 --------
 9 files changed, 178 insertions(+), 211 deletions(-)

       via  ddb83a220cd6f3b62171c3c374c58e553d82a5d6 (commit)
       via  c4c8e9b0350aedf985dd99168ce6d3b5afb60acb (commit)
       via  6a2f46b152dd122df40012a487b4f4c2f5e37197 (commit)
       via  2ad8f9ccb5d02e76437e48f2193fbacc4a9ca2ad (commit)
       via  7253b0d4cdf9612a4c0de0ca849979cec5e8d382 (commit)
       via  1856a3a1e9c95b4db4742ab53f737e91dbf46cff (commit)
       via  14dbdda455cb0e49b8848575337c5e7806747ee7 (commit)
       via  c3a7bb61e982ff5b0747204b79c4ca759c19b537 (commit)
       via  2c3c9f64426e825295aeb1f4265d67429ee14cf6 (commit)
       via  e59b42354a10079ecd579a1dbe53c39a20d05313 (commit)
       via  5106490f8cb4d3e6aaa8da2ae46283c1ef64a027 (commit)
       via  f42c7e3d3344104206ca0b8669e2b07a6b30388e (commit)
       via  a00eab83a1a2636f5c18be8109f73bf050d1ec88 (commit)
       via  de98daba898ad2dfa58c9e810d98dadf4d208b95 (commit)
       via  fc2dc01f5e98b3c1d663e78f882eed20962de9d7 (commit)
       via  cfcfa1c48d95a07bb961baeef8d7658ddecce41e (commit)
       via  b67167e763608af2909ce4e4e25c03d0e7db8b84 (commit)
       via  6e7c96b2bdf0498028bf6ee3902289e81ec1f2d7 (commit)
      from  cd25f265349e86fab2fbe81959747ce112986806 (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 ddb83a220cd6f3b62171c3c374c58e553d82a5d6
Merge: cd25f26 c4c8e9b
Author: Manoj <jonam33 at gmail.com>
Date:   Mon Jul 20 15:36:40 2015 -0400

    closes #6465
    Merge branch '6465-optimize-workbench-integration-tests'


commit c4c8e9b0350aedf985dd99168ce6d3b5afb60acb
Author: Manoj <jonam33 at gmail.com>
Date:   Mon Jul 20 15:35:39 2015 -0400

    6465: Added back bundled with

diff --git a/apps/workbench/Gemfile.lock b/apps/workbench/Gemfile.lock
index 20b8d61..bc7ddaf 100644
--- a/apps/workbench/Gemfile.lock
+++ b/apps/workbench/Gemfile.lock
@@ -294,3 +294,6 @@ DEPENDENCIES
   therubyracer
   uglifier (>= 1.0.3)
   wiselinks
+
+BUNDLED WITH
+   1.10.5

commit 6a2f46b152dd122df40012a487b4f4c2f5e37197
Merge: 2ad8f9c cd25f26
Author: Manoj <jonam33 at gmail.com>
Date:   Mon Jul 20 15:31:29 2015 -0400

    Merge branch 'master' into 6465-optimize-workbench-integration-tests


commit 2ad8f9ccb5d02e76437e48f2193fbacc4a9ca2ad
Author: Manoj <jonam33 at gmail.com>
Date:   Mon Jul 20 15:24:46 2015 -0400

    6465: Added comments to explain test "find a project and edit description
    with link to object".

diff --git a/apps/workbench/test/controllers/projects_controller_test.rb b/apps/workbench/test/controllers/projects_controller_test.rb
index 7f2b2cd..4be4c08 100644
--- a/apps/workbench/test/controllers/projects_controller_test.rb
+++ b/apps/workbench/test/controllers/projects_controller_test.rb
@@ -341,9 +341,13 @@ class ProjectsControllerTest < ActionController::TestCase
     project = api_fixture('groups')['aproject']
     use_token :active
     found = Group.find(project['uuid'])
+
+    # uses 'Link to object' as a hyperlink for the object
     found.description = '"Link to object":' + api_fixture('groups')['asubproject']['uuid']
     found.save!
     get(:show, {id: project['uuid']}, session_for(:active))
+
+    # check that input was converted to textile, not staying as inputted
     refute_includes  @response.body,'"Link to object"'
     refute_empty css_select('[href="/groups/zzzzz-j7d0g-axqo7eu9pwvna1x"]')
   end

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


hooks/post-receive
--