[ARVADOS] updated: c51a3888a01543d0835119574960a02fd7d35994
git at public.curoverse.com
git at public.curoverse.com
Wed May 27 15:30:22 EDT 2015
Summary of changes:
apps/workbench/app/views/layouts/body.html.erb | 4 +-
.../test/controllers/projects_controller_test.rb | 28 ++++-------
.../test/integration/application_layout_test.rb | 2 +-
...l-manual-prerequisites-ruby.html.textile.liquid | 3 +-
docker/api/Dockerfile | 4 +-
docker/api/apache2_vhost.in | 2 -
docker/api/application.yml.in | 11 +---
docker/api/arvados-clients.yml.in | 2 +-
.../{keep_server_1.json => keep_server_0.json.in} | 3 +-
.../{keep_server_0.json => keep_server_1.json.in} | 2 +-
docker/api/omniauth.rb.in | 2 +-
docker/api/setup-gitolite.sh.in | 4 +-
docker/arvdock | 58 ++++++++++++++++------
docker/build_tools/Makefile | 11 +++-
docker/build_tools/build.rb | 52 +++++++++----------
docker/config.yml.example | 12 +----
docker/doc/Dockerfile | 5 +-
docker/doc/{apache2_vhost => apache2_vhost.in} | 5 +-
docker/sso/apache2_vhost.in | 2 -
docker/workbench/Dockerfile | 4 +-
docker/workbench/apache2_vhost.in | 13 ++++-
docker/workbench/application.yml.in | 6 ++-
services/api/app/models/arvados_model.rb | 21 ++++----
...50526180251_leading_space_on_full_text_index.rb | 41 +++++++++++++++
services/api/db/structure.sql | 20 +++++---
25 files changed, 191 insertions(+), 126 deletions(-)
rename docker/api/{keep_server_1.json => keep_server_0.json.in} (59%)
rename docker/api/{keep_server_0.json => keep_server_1.json.in} (59%)
rename docker/doc/{apache2_vhost => apache2_vhost.in} (62%)
create mode 100644 services/api/db/migrate/20150526180251_leading_space_on_full_text_index.rb
via c51a3888a01543d0835119574960a02fd7d35994 (commit)
via 6fed84983e6e973eefff66a126f4bb7811c44d29 (commit)
via e73222a8d0c18b159ae3d8b53b54474650bdda16 (commit)
via d9214af111bb44deed1246ec97624b6bd8d970c5 (commit)
via 59d68bda41fcc83c47795a19dbe1d0c180952a08 (commit)
via 15009c109bee16bc09c9bbc11f7df0a677a0cf23 (commit)
via a7d558d6c2db242a6555c7f397cb4d91618aa13c (commit)
via ae3bb0033a24a38489c49ffc26e5a5e8fd93c160 (commit)
from a2eb98fa68672d6966233d7864c328feb8df3939 (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 c51a3888a01543d0835119574960a02fd7d35994
Author: radhika <radhika at curoverse.com>
Date: Wed May 27 15:26:20 2015 -0400
6057: few more minor tweaks
diff --git a/apps/workbench/app/views/layouts/body.html.erb b/apps/workbench/app/views/layouts/body.html.erb
index 6c23035..54e6626 100644
--- a/apps/workbench/app/views/layouts/body.html.erb
+++ b/apps/workbench/app/views/layouts/body.html.erb
@@ -117,7 +117,7 @@
<% end %>
<% else %>
<% if Rails.configuration.anonymous_user_token %>
- <li><%= link_to raw('Browse public projects'), "/projects/public" %></li>
+ <li><%= link_to 'Browse public projects', "/projects/public" %></li>
<% end %>
<li class="dropdown hover-dropdown login-menu">
<a href="<%= arvados_api_client.arvados_login_url(return_to: root_url) %>">Log in</a>
@@ -184,7 +184,7 @@
</a>
<ul class="dropdown-menu" style="min-width: 20em" role="menu">
<% if Rails.configuration.anonymous_user_token %>
- <li><%= link_to raw('Browse public projects'), "/projects/public", class: 'btn btn-xs btn-default pull-right' %></li>
+ <li><%= link_to 'Browse public projects', "/projects/public", class: 'btn btn-xs btn-default pull-right' %></li>
<% end %>
<li>
<%= link_to projects_path(options: {ensure_unique_name: true}), method: :post, class: 'btn btn-xs btn-default pull-right' do %>
diff --git a/apps/workbench/test/controllers/projects_controller_test.rb b/apps/workbench/test/controllers/projects_controller_test.rb
index b050383..d7fb8f2 100644
--- a/apps/workbench/test/controllers/projects_controller_test.rb
+++ b/apps/workbench/test/controllers/projects_controller_test.rb
@@ -265,25 +265,19 @@ class ProjectsControllerTest < ActionController::TestCase
assert_response :success
assert_not_nil assigns(:objects)
project_names = assigns(:objects).collect(&:name)
- assert_operator 0, :<, project_names.length
- assert project_names.include?('Unrestricted public data')
- assert !project_names.include?('A Project')
+ assert_includes project_names, 'Unrestricted public data'
+ assert_not_includes project_names, 'A Project'
end
end
- [
- nil,
- :active,
- ].each do |user|
- test "visit public projects page when anon config is not enabled, as user #{user}, and expect no such page" do
- if user
- get :public, {}, session_for(user)
- assert_response 404
- else
- get :public
- assert_response :redirect
- assert_match /\/users\/welcome/, @response.redirect_url
- end
- end
+ test "visit public projects page when anon config is not enabled as active user and expect 404" do
+ get :public, {}, session_for(:active)
+ assert_response 404
+ end
+
+ test "visit public projects page when anon config is not enabled as anonymous and expect login page" do
+ get :public
+ assert_response :redirect
+ assert_match /\/users\/welcome/, @response.redirect_url
end
end
diff --git a/apps/workbench/test/integration/application_layout_test.rb b/apps/workbench/test/integration/application_layout_test.rb
index f8984f0..daf2b09 100644
--- a/apps/workbench/test/integration/application_layout_test.rb
+++ b/apps/workbench/test/integration/application_layout_test.rb
@@ -25,7 +25,7 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
assert page.has_link?("Projects"), 'Not found link - Projects'
page.find("#projects-menu").click
assert_selector 'a', text: 'Add a new project'
- assert_no_selector 'a', text: 'Browse public projects' # anonymous config is not enabled by default
+ assert_no_selector 'a', text: 'Browse public projects'
assert page.has_text?('Projects shared with me'), 'Not found text - Project shared with me'
end
elsif invited
commit 6fed84983e6e973eefff66a126f4bb7811c44d29
Merge: a2eb98f e73222a
Author: radhika <radhika at curoverse.com>
Date: Wed May 27 15:03:54 2015 -0400
Merge branch 'master' into 6057-public-projects-page
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list