[ARVADOS] updated: 68b018141677e7147fe2b52a88561dc7d57e6d79
git at public.curoverse.com
git at public.curoverse.com
Tue Jul 21 11:32:25 EDT 2015
Summary of changes:
.../app/controllers/application_controller.rb | 1 +
.../app/views/users/_manage_repositories.html.erb | 1 +
.../views/users/_manage_virtual_machines.html.erb | 9 +-
apps/workbench/config/load_config.rb | 12 ++-
.../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/application_layout_test.rb | 8 ++
.../test/integration/collection_upload_test.rb | 7 --
.../workbench/test/integration/collections_test.rb | 45 ---------
apps/workbench/test/integration/projects_test.rb | 109 ---------------------
.../test/integration/user_manage_account_test.rb | 2 +
apps/workbench/test/integration/users_test.rb | 40 --------
doc/_config.yml | 1 +
doc/_includes/_tutorial_expectations.liquid | 2 +-
doc/images/add-new-repository.png | Bin 10026 -> 9575 bytes
doc/images/added-new-repository.png | Bin 0 -> 14210 bytes
doc/images/vm-access-with-webshell.png | Bin 0 -> 61121 bytes
.../install-arv-git-httpd.html.textile.liquid | 24 ++---
.../install-shell-server.html.textile.liquid | 13 +++
.../check-environment.html.textile.liquid | 2 +-
.../ssh-access-unix.html.textile.liquid | 2 +-
.../ssh-access-windows.html.textile.liquid | 2 +-
.../vm-login-with-webshell.html.textile.liquid | 19 ++++
doc/user/reference/api-tokens.html.textile.liquid | 2 +-
.../add-new-repository.html.textile.liquid | 10 +-
.../tutorial-submit-job.html.textile.liquid | 13 ++-
sdk/python/arvados/util.py | 18 ++--
sdk/python/tests/test_util.py | 18 +++-
31 files changed, 294 insertions(+), 254 deletions(-)
create mode 100644 doc/images/added-new-repository.png
create mode 100644 doc/images/vm-access-with-webshell.png
create mode 100644 doc/user/getting_started/vm-login-with-webshell.html.textile.liquid
via 68b018141677e7147fe2b52a88561dc7d57e6d79 (commit)
via 106df13f4470b75e6fb4114c94b32b6fc68736f4 (commit)
via 7879727a44d761e633f7282fad6073549495be8a (commit)
via ddb83a220cd6f3b62171c3c374c58e553d82a5d6 (commit)
via c4c8e9b0350aedf985dd99168ce6d3b5afb60acb (commit)
via 6a2f46b152dd122df40012a487b4f4c2f5e37197 (commit)
via cd25f265349e86fab2fbe81959747ce112986806 (commit)
via 2ad8f9ccb5d02e76437e48f2193fbacc4a9ca2ad (commit)
via b23101649f5320c7f4f5c68f3d7745373e316249 (commit)
via b08e97355a492d9b4710721b5105e981e49e8238 (commit)
via a1ed06fc35101b054efa62a757c92c3c4d14ff06 (commit)
via ee29db4af2c800924fa06b7bbc1f3058ba3cfb94 (commit)
via 70e832c1c5976614c4da5c2987ecba7217c3e83a (commit)
via e0ab53eaacc78f74e3f446f2cd5f58b8add29898 (commit)
via f7c152d3ca9a753812bd7729ceb6cb8a23b12fce (commit)
via 0b19163c8633defab5988f8b775833d3358ebaaf (commit)
via 4a35a164fcddb66e04df2afe4686783fd3b35510 (commit)
via 7253b0d4cdf9612a4c0de0ca849979cec5e8d382 (commit)
via edb109c244d25fb9a963a2146953710fd4d77099 (commit)
via caa9e89d531f03838e64d36d050be9d96e7c6c96 (commit)
via 1d5e009a31e0b462b7bfcf4c0e5dc36db423c90f (commit)
via 78e3248417510aecbac9e66a22d48e32a80181bf (commit)
via 61187968f0e9268430b967ce37a79d9384ec7e3c (commit)
via 77aeb6fdedab3d2aac25120e5a99317155c9f26e (commit)
via 94afae23dd927b2d9d6c3472f90bc00f0310bbf5 (commit)
via a1e6ebc7e1afc04e8a1de0c0bb8e304eda6ecf2c (commit)
via 706f34d335cecb9f321dda8abaf8718fa951e908 (commit)
via 9ac57b0bc6cb5d90da57c943df489401c63b7a7f (commit)
via acacdd86095218aa2bb4cc4cd564d9d7f135da3c (commit)
via 85b29e4db84f53e390c7964f43caf91d3a764510 (commit)
via 702ce6c3da9a1b09a2ed546fd3da775d21bd703b (commit)
via fb9730d1da1eab233e4e7ea01c1015cd70ba6cf7 (commit)
via db2584826ed9aadb162b8bd6d25e164565bbab8b (commit)
via 6ba447b83ef96f0f52db5eebd04fd22e5a0e1c74 (commit)
via 1856a3a1e9c95b4db4742ab53f737e91dbf46cff (commit)
via 25e646a708d1d91aebcf8db80b8ae1fafa044034 (commit)
via c790738ae71771a5574b166b3e93a1bca9b89bf6 (commit)
via ed8897b942f147afccf8eeac1025861ffe2f1690 (commit)
via 318e3d183c3800863731a20a10f1b8bf9cc82280 (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 61d432f332dd9314f8c4cd57c2393e80e8ecef59 (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 68b018141677e7147fe2b52a88561dc7d57e6d79
Merge: 61d432f 106df13
Author: Manoj <jonam33 at gmail.com>
Date: Tue Jul 21 11:32:04 2015 -0400
Merge branch 'master' into 6652-test-system-menu
Conflicts:
apps/workbench/test/integration/application_layout_test.rb
diff --cc apps/workbench/test/integration/application_layout_test.rb
index f05021c,1f9edd4..31a297f
--- a/apps/workbench/test/integration/application_layout_test.rb
+++ b/apps/workbench/test/integration/application_layout_test.rb
@@@ -202,34 -202,11 +202,42 @@@ class ApplicationLayoutTest < ActionDis
end
end
+ test "no SSH public key notification when shell_in_a_box_url is configured" do
+ Rails.configuration.shell_in_a_box_url = 'example.com'
+ visit page_with_token('job_reader')
+ click_link 'notifications-menu'
+ assert_no_selector 'a', text:'Click here to set up an SSH public key for use with Arvados.'
+ assert_selector 'a', text:'Click here to learn how to run an Arvados Crunch pipeline'
+ end
++
+ [
+ ['Repositories','repository','Attributes'],
+ ['Virtual machines','virtual machine','current_user_logins'],
+ ['SSH keys','authorized key','public_key'],
+ ['Links','link','link_class'],
+ ['Groups','group','group_class'],
+ ['Compute nodes','node','info[ping_secret'],
+ ['Keep services','keep service','service_ssl_flag'],
+ ['Keep disks', 'keep disk','bytes_free'],
+ ].each do |page_name, add_button_text, look_for|
+ test "test system menu #{page_name} link" do
+ skip 'Skip repositories test until #6652 is fixed.' if page_name == 'Repositories'
+
+ visit page_with_token('admin')
+ within('.navbar-fixed-top') do
+ page.find("#system-menu").click
+ within('.dropdown-menu') do
+ assert_selector 'a', text: page_name
+ find('a', text: page_name).click
+ end
+ end
+
+ # click the add button
+ assert_selector 'button', text: "Add a new #{add_button_text}"
+ find('button', text: "Add a new #{add_button_text}").click
+
+ # look for unique property in the created object page
+ assert page.has_text? look_for
+ end
+ end
end
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list