[ARVADOS] updated: f369f469ef9417579b46402d9e95dbf4c86638e7
git at public.curoverse.com
git at public.curoverse.com
Thu Aug 13 10:43:01 EDT 2015
Summary of changes:
apps/workbench/app/views/layouts/body.html.erb | 2 +-
.../test/integration/anonymous_access_test.rb | 4 +-
.../test/integration/application_layout_test.rb | 4 +-
.../test/integration/pipeline_instances_test.rb | 2 +-
apps/workbench/test/integration/projects_test.rb | 8 +-
doc/_config.yml | 2 +-
.../install-crunch-dispatch.html.textile.liquid | 36 ++---
doc/install/install-keepproxy.html.textile.liquid | 11 +-
.../running-external-program.html.textile.liquid | 10 ++
services/api/test/fixtures/groups.yml | 16 +++
services/arv-git-httpd/auth_handler.go | 16 ++-
services/arv-git-httpd/server_test.go | 29 ++++
services/keepstore/bufferpool_test.go | 5 +
services/keepstore/handlers.go | 26 +++-
services/keepstore/perms_test.go | 2 +-
services/keepstore/pull_worker.go | 1 +
services/keepstore/pull_worker_integration_test.go | 6 +-
services/keepstore/pull_worker_test.go | 48 +++----
services/keepstore/status_test.go | 21 +++
services/keepstore/trash_worker.go | 1 +
services/keepstore/trash_worker_test.go | 30 ++++-
services/keepstore/volume_test.go | 21 ++-
services/keepstore/work_queue.go | 148 ++++++++++++++-------
services/keepstore/work_queue_test.go | 147 ++++++++++++++++----
24 files changed, 445 insertions(+), 151 deletions(-)
create mode 100644 services/keepstore/status_test.go
via f369f469ef9417579b46402d9e95dbf4c86638e7 (commit)
via 8da21217b17abe84ad3aab1a4ad547bbb5c4d1fd (commit)
via 2825758b45ca273e7bcf176b636ff36487d25857 (commit)
via 5dd20e4a0aac7428a68dabbf5ec2c6800f32957b (commit)
via c52b7c3f28031e6dec9601ffd8583f689149a380 (commit)
via aae246886e945f0bba3bfa2a817971e4ad52e050 (commit)
via 318d446ad02c4511146403897db076acf16e0c9e (commit)
via 522404b2066c8b635a240f79dd4bf652479afadb (commit)
via 862843135810f7ba4bc6c2138f2ba1bb8840e432 (commit)
via f618b6517fff37194a1a4183a607658f46952732 (commit)
via 2d9cae58ae387d29d161ea96b6cd704d0764b1d8 (commit)
via 7c89127a0214c77578c09bac9ac24ce9e1c5e104 (commit)
via 70ddebda3dbe90c8a347c9077397106c6fb949c0 (commit)
via a6edcb025f0b659e464fd3e98e59e966ced88afd (commit)
via ae2478d6d09d2ab2eac1acceab8342f4f900ec8b (commit)
via d89b7ae1f6fa35dd3627ead14c855751f1de2193 (commit)
via 5562d6d556a942b66ea392c1e9bc803f9b9733e7 (commit)
via ab689cf0a5c73e1fa0525416fa12aaf5ba88abc9 (commit)
via 4de0af809ffbef43d89cd1751e5d611a4b5445e9 (commit)
via e0213cbec6a151e077b8cca00700815c3c3d18e7 (commit)
via 2553fde59a3cf872be891a4f689c241055080c35 (commit)
via 63b82f437c0f237c76f460ef71be0bb3ed42f7f4 (commit)
via 3959d7afff8bb3c3b8da9eb7d178919275180f2a (commit)
via 2f719adbd0eb4ce07fc2c7012bc1ce8df02e790b (commit)
from af8e85324d376f47009c3abee00345188cc2f205 (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 f369f469ef9417579b46402d9e95dbf4c86638e7
Author: Manoj <jonam33 at gmail.com>
Date: Thu Aug 13 10:42:30 2015 -0400
6640: Modified tests and added fixture for 201 projects.
diff --git a/apps/workbench/app/views/layouts/body.html.erb b/apps/workbench/app/views/layouts/body.html.erb
index 7ea7743..c322905 100644
--- a/apps/workbench/app/views/layouts/body.html.erb
+++ b/apps/workbench/app/views/layouts/body.html.erb
@@ -211,7 +211,7 @@
action_name: 'Show',
action_href: url_for(controller: :actions, action: :show),
action_method: 'get',
- action_data: {selection_param: 'uuid', success: 'redirect-to-created-object', copy_from_search_box: true}.to_json),
+ action_data: {selection_param: 'uuid', success: 'redirect-to-created-object', copy_from_search_box: true}.to_json),
{ remote: true, method: 'get', title: "Search" }) do %>
<i class="glyphicon fa-fw glyphicon-search"></i> Search all projects
<% end %>
diff --git a/apps/workbench/test/integration/anonymous_access_test.rb b/apps/workbench/test/integration/anonymous_access_test.rb
index 7d3dfab..e1c8359 100644
--- a/apps/workbench/test/integration/anonymous_access_test.rb
+++ b/apps/workbench/test/integration/anonymous_access_test.rb
@@ -19,9 +19,9 @@ class AnonymousAccessTest < ActionDispatch::IntegrationTest
assert_text 'Unrestricted public data'
assert_selector 'a', text: 'Projects'
page.find("#projects-menu").click
- assert_selector 'a', text: 'Add a new project'
+ assert_selector 'a', text: 'Create a new project'
assert_selector 'a', text: 'Browse public projects'
- assert page.has_text?('Projects shared with me'), 'Not found text - Project shared with me'
+ assert page.has_text?('My projects'), 'Not found text - My projects'
else
assert_text 'indicate that you have read and accepted the user agreement'
end
diff --git a/apps/workbench/test/integration/application_layout_test.rb b/apps/workbench/test/integration/application_layout_test.rb
index a8932d7..f73cd87 100644
--- a/apps/workbench/test/integration/application_layout_test.rb
+++ b/apps/workbench/test/integration/application_layout_test.rb
@@ -24,9 +24,9 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
else
assert page.has_link?("Projects"), 'Not found link - Projects'
page.find("#projects-menu").click
- assert_selector 'a', text: 'Add a new project'
+ assert_selector 'a', text: 'Create a new project'
assert_no_selector 'a', text: 'Browse public projects'
- assert page.has_text?('Projects shared with me'), 'Not found text - Project shared with me'
+ assert page.has_text?('My projects'), 'Not found text - My projects'
end
elsif invited
assert page.has_text?('Please check the box below to indicate that you have read and accepted the user agreement'), 'Not found text - Please check the box below . . .'
diff --git a/apps/workbench/test/integration/pipeline_instances_test.rb b/apps/workbench/test/integration/pipeline_instances_test.rb
index b6bf700..b803129 100644
--- a/apps/workbench/test/integration/pipeline_instances_test.rb
+++ b/apps/workbench/test/integration/pipeline_instances_test.rb
@@ -531,7 +531,7 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
assert_equal(true, found_count>=expected_min,
"Found too few items. Expected at least #{expected_min} and found #{found_count}")
assert_equal(true, found_count<=expected_max,
- "Found too many items. Expected at most #{expected_max} and found #{found_count}")
+ "Found too many items. Expected at most #{expected_max} and found #{found_count}")z
end
end
end
diff --git a/apps/workbench/test/integration/projects_test.rb b/apps/workbench/test/integration/projects_test.rb
index dc54b8d..4401a6f 100644
--- a/apps/workbench/test/integration/projects_test.rb
+++ b/apps/workbench/test/integration/projects_test.rb
@@ -382,9 +382,7 @@ class ProjectsTest < ActionDispatch::IntegrationTest
my_project = api_fixture('groups')['aproject']
my_collection = api_fixture('collections')['collection_to_move_around_in_aproject']
- visit page_with_token user, '/'
- find("#projects-menu").click
- find(".dropdown-menu a", text: my_project['name']).click
+ visit page_with_token user, "/projects/#{my_project['uuid']}"
click_link 'Data collections'
assert page.has_text?(my_collection['name']), 'Collection not found in project'
@@ -559,13 +557,13 @@ class ProjectsTest < ActionDispatch::IntegrationTest
# Add a new project
find("#projects-menu").click
- click_link 'Add a new project'
+ click_link 'Create a new project'
assert_text 'New project'
assert_text 'No description provided'
# Add one more new project
find("#projects-menu").click
- click_link 'Add a new project'
+ click_link 'Create a new project'
match = /New project \(\d\)/.match page.text
assert match, 'Expected project name not found'
assert_text 'No description provided'
diff --git a/services/api/test/fixtures/groups.yml b/services/api/test/fixtures/groups.yml
index f6b99a0..b885e23 100644
--- a/services/api/test/fixtures/groups.yml
+++ b/services/api/test/fixtures/groups.yml
@@ -282,3 +282,19 @@ subproject_in_asubproject_with_same_name_as_one_in_active_user_home:
name: Subproject to test owner uuid and name unique key violation upon removal
description: "Removing this will result in name conflict with 'A project' in Home project and hence get renamed."
group_class: project
+
+# Test Helper trims the rest of the file
+
+# Do not add your fixtures below this line as the rest of this file will be trimmed by test_helper
+
+# projects owned by user1_with_load
+<% for i in 1..201 do %>
+project_<%=i%>_of_201:
+ uuid: zzzzz-j7d0g-201gneyn6brd<%= i.to_s.rjust(3, '0') %>
+ owner_uuid: zzzzz-tpzed-user1withloadab
+ created_at: <%= i.minute.ago.to_s(:db) %>
+ name: Project_<%= i %>
+ group_class: project
+<% end %>
+
+# Do not add your fixtures below this line as the rest of this file will be trimmed by test_helper
commit 8da21217b17abe84ad3aab1a4ad547bbb5c4d1fd
Merge: af8e853 2825758
Author: Manoj <jonam33 at gmail.com>
Date: Wed Aug 12 12:05:21 2015 -0400
Merge branch 'master' into 6640-projects-menu-incomplete
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list