[ARVADOS] updated: e3c562dff0f84634c12e14c232a5ab677892ed6e
git at public.curoverse.com
git at public.curoverse.com
Tue Mar 31 15:38:21 EDT 2015
Summary of changes:
.../app/controllers/actions_controller.rb | 2 +-
apps/workbench/app/views/layouts/body.html.erb | 2 +-
apps/workbench/app/views/users/profile.html.erb | 2 +-
.../test/integration/application_layout_test.rb | 4 -
.../test/integration/report_issue_test.rb | 2 -
.../test/integration/user_profile_test.rb | 10 +--
docker/api/application.yml.in | 11 +--
docker/api/arvados-clients.yml.in | 2 +-
docker/api/setup-gitolite.sh.in | 5 +-
docker/api/setup.sh.in | 4 +-
docker/arvdock | 100 ++++++++++++---------
docker/keep/Dockerfile | 2 +
docker/keepproxy/run-keepproxy.in | 8 +-
docker/workbench/apache2_foreground.sh | 5 --
docker/workbench/application.yml.in | 5 +-
15 files changed, 85 insertions(+), 79 deletions(-)
via e3c562dff0f84634c12e14c232a5ab677892ed6e (commit)
via 17379ed7eb6e143667e53097f5ada570f051efd1 (commit)
via 3353ab9554dc5dfa647dd767b7b2623adcf753ab (commit)
via e97d70a1f6c687ce110f40d0e44a9fa385873ad6 (commit)
via 70ab42cb727b6a1bd1a8b26e2481de7caa0853d5 (commit)
via 3f99a8c6db9103420bccf6b01ba85ed1cef83cde (commit)
via 78691191dfa23c930a00c6d5cb6dcd4ce30b1a5e (commit)
from 1f5a673014724c3444404658e65e32a6f9c562f3 (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 e3c562dff0f84634c12e14c232a5ab677892ed6e
Author: Radhika Chippada <radhika at curoverse.com>
Date: Tue Mar 31 15:21:21 2015 -0400
5493: test uncovered an issue with getting_started_shown handling; fixed it.
diff --git a/apps/workbench/app/controllers/actions_controller.rb b/apps/workbench/app/controllers/actions_controller.rb
index 9db8827..d1c7f42 100644
--- a/apps/workbench/app/controllers/actions_controller.rb
+++ b/apps/workbench/app/controllers/actions_controller.rb
@@ -1,6 +1,6 @@
class ActionsController < ApplicationController
- skip_filter :require_thread_api_token, only: [:report_issue_popup, :report_issue, :getting_started_popup]
+ skip_filter :require_thread_api_token, only: [:report_issue_popup, :report_issue]
skip_filter :check_user_agreements, only: [:report_issue_popup, :report_issue]
@@exposed_actions = {}
diff --git a/apps/workbench/app/views/layouts/body.html.erb b/apps/workbench/app/views/layouts/body.html.erb
index e126cab..b0a54c9 100644
--- a/apps/workbench/app/views/layouts/body.html.erb
+++ b/apps/workbench/app/views/layouts/body.html.erb
@@ -198,7 +198,7 @@
<% end %>
<%= render partial: 'browser_unsupported' %><%# requires JS support below %>
- <%= render partial: 'getting_started_popup' %><%# requires JS support below %>
+ <%= render partial: 'getting_started_popup' %>
<div id="page-wrapper">
<%= yield %>
diff --git a/apps/workbench/app/views/users/profile.html.erb b/apps/workbench/app/views/users/profile.html.erb
index 82c2c15..4fefa82 100644
--- a/apps/workbench/app/views/users/profile.html.erb
+++ b/apps/workbench/app/views/users/profile.html.erb
@@ -16,7 +16,7 @@
<div class="panel-body">
<% if !missing_required_profile? && params[:offer_return_to] %>
<div class="alert alert-success">
- <% if current_user.prefs['getting_started_shown'] %>
+ <% if current_user.prefs[:getting_started_shown] %>
<p>Thank you for filling in your profile. <%= link_to 'Back to work!', params[:offer_return_to], class: 'btn btn-sm btn-primary' %></p>
<% else %>
<p>Thank you for filling in your profile. <%= link_to 'Get started', params[:offer_return_to], class: 'btn btn-sm btn-primary' %></p>
diff --git a/apps/workbench/test/integration/application_layout_test.rb b/apps/workbench/test/integration/application_layout_test.rb
index 667fd30..ed65563 100644
--- a/apps/workbench/test/integration/application_layout_test.rb
+++ b/apps/workbench/test/integration/application_layout_test.rb
@@ -110,8 +110,6 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
['active_no_prefs', api_fixture('users')['active_no_prefs'], true, false],
['active_no_prefs_profile_no_getting_started_shown',
api_fixture('users')['active_no_prefs_profile_no_getting_started_shown'], true, false],
- ['active_no_prefs_profile_with_getting_started_shown',
- api_fixture('users')['active_no_prefs_profile_with_getting_started_shown'], true, false],
].each do |token, user, invited, has_profile|
test "visit home page for user #{token}" do
@@ -164,13 +162,11 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
assert_no_selector 'button:not([disabled])', text: 'Prev' # Prev button is again disabled
# Click Next until last page is reached and verify that it is disabled
- foundDisabledNext = false
(0..20).each do |i| # currently we only have 4 pages, and don't expect to have more than 20 in future
click_button 'Next'
begin
find('button:not([disabled])', text: 'Next')
rescue => e
- foundDisabledNext = true if e.message.include?('Unable to find')
break
end
end
diff --git a/apps/workbench/test/integration/report_issue_test.rb b/apps/workbench/test/integration/report_issue_test.rb
index 732b778..4e1920a 100644
--- a/apps/workbench/test/integration/report_issue_test.rb
+++ b/apps/workbench/test/integration/report_issue_test.rb
@@ -86,8 +86,6 @@ class ReportIssueTest < ActionDispatch::IntegrationTest
['active_no_prefs', api_fixture('users')['active_no_prefs']],
['active_no_prefs_profile_no_getting_started_shown',
api_fixture('users')['active_no_prefs_profile_no_getting_started_shown']],
- ['active_no_prefs_profile_with_getting_started_shown',
- api_fixture('users')['active_no_prefs_profile_with_getting_started_shown']],
].each do |token, user|
test "check version info and report issue for user #{token}" do
diff --git a/apps/workbench/test/integration/user_profile_test.rb b/apps/workbench/test/integration/user_profile_test.rb
index 3d17fd2..9fa7afa 100644
--- a/apps/workbench/test/integration/user_profile_test.rb
+++ b/apps/workbench/test/integration/user_profile_test.rb
@@ -10,7 +10,7 @@ class UserProfileTest < ActionDispatch::IntegrationTest
Rails.configuration.user_profile_form_fields = @user_profile_form_fields
end
- def verify_homepage_with_profile user, invited, has_profile, getting_started_shown=false
+ def verify_homepage_with_profile user, invited, has_profile
profile_config = Rails.configuration.user_profile_form_fields
if !user
@@ -18,7 +18,7 @@ class UserProfileTest < ActionDispatch::IntegrationTest
elsif user['is_active']
if profile_config && !has_profile
assert page.has_text?('Save profile'), 'No text - Save profile'
- add_profile user, invited, has_profile, getting_started_shown
+ add_profile user
else
assert page.has_text?('Active pipelines'), 'Not found text - Active pipelines'
assert page.has_no_text?('Save profile'), 'Found text - Save profile'
@@ -69,7 +69,7 @@ class UserProfileTest < ActionDispatch::IntegrationTest
end
# Check manage profile page and add missing profile to the user
- def add_profile user, invited, has_profile, getting_started_shown
+ def add_profile user
assert page.has_no_text?('My projects'), 'Found text - My projects'
assert page.has_no_text?('Projects shared with me'), 'Found text - Projects shared with me'
@@ -109,7 +109,7 @@ class UserProfileTest < ActionDispatch::IntegrationTest
click_button "Save profile"
# profile saved and in profile page now with success
assert page.has_text?('Thank you for filling in your profile'), 'No text - Thank you for filling'
- if getting_started_shown
+ if user['prefs']['getting_started_shown']
click_link 'Back to work!'
else
click_link 'Get started'
@@ -129,7 +129,7 @@ class UserProfileTest < ActionDispatch::IntegrationTest
['active_no_prefs_profile_no_getting_started_shown',
api_fixture('users')['active_no_prefs_profile_no_getting_started_shown'], true, false],
['active_no_prefs_profile_with_getting_started_shown',
- api_fixture('users')['active_no_prefs_profile_with_getting_started_shown'], true, false, true],
+ api_fixture('users')['active_no_prefs_profile_with_getting_started_shown'], true, false],
].each do |token, user, invited, has_profile|
test "visit home page when profile is configured for user #{token}" do
commit 17379ed7eb6e143667e53097f5ada570f051efd1
Merge: 1f5a673 3353ab9
Author: Radhika Chippada <radhika at curoverse.com>
Date: Tue Mar 31 14:51:19 2015 -0400
Merge branch 'master' into 5493-getting-started-modal
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list