[ARVADOS] updated: ed0067ee9964c70f646a5f4f72c1302cc19c007c
git at public.curoverse.com
git at public.curoverse.com
Mon Dec 1 16:10:01 EST 2014
Summary of changes:
apps/workbench/Gemfile | 2 +-
apps/workbench/Gemfile.lock | 161 +++++++-------
.../workbench/app/views/users/_show_admin.html.erb | 2 +-
.../actions_controller_test.rb | 0
.../api_client_authorizations_controller_test.rb | 0
.../application_controller_test.rb | 4 +
.../authorized_keys_controller_test.rb | 0
.../controllers/collections_controller_test.rb | 231 +++++++++++++++++++++
.../groups_controller_test.rb | 0
.../humans_controller_test.rb | 0
.../job_tasks_controller_test.rb | 0
.../jobs_controller_test.rb | 0
.../keep_disks_controller_test.rb | 0
.../links_controller_test.rb | 0
.../logs_controller_test.rb | 0
.../nodes_controller_test.rb | 0
.../pipeline_instances_controller_test.rb | 171 ++++++++++++---
.../pipeline_templates_controller_test.rb | 0
.../projects_controller_test.rb | 0
.../repositories_controller_test.rb | 0
.../sessions_controller_test.rb | 0
.../specimens_controller_test.rb | 0
.../traits_controller_test.rb | 0
.../user_agreements_controller_test.rb | 0
.../users_controller_test.rb | 2 +-
.../virtual_machines_controller_test.rb | 0
apps/workbench/test/diagnostics_test_helper.rb | 4 +
apps/workbench/test/functional/.gitkeep | 0
.../test/functional/collections_controller_test.rb | 229 --------------------
.../pipeline_instances_controller_test.rb | 157 --------------
.../test/helpers/pipeline_instances_helper_test.rb | 38 ++++
.../test/integration/application_layout_test.rb | 5 +
apps/workbench/test/integration/projects_test.rb | 9 +-
apps/workbench/test/test_helper.rb | 66 +++++-
services/api/Gemfile | 2 +-
.../api/app/controllers/database_controller.rb | 54 +++++
services/api/app/models/database_seeds.rb | 11 +
services/api/config/routes.rb | 4 +
services/api/db/seeds.rb | 10 +-
services/api/lib/current_api_client.rb | 3 +-
services/api/test/fixtures/groups.yml | 4 +-
services/api/test/fixtures/users.yml | 16 ++
.../test/functional/database_controller_test.rb | 47 +++++
.../api/test/integration/database_reset_test.rb | 75 +++++++
services/api/test/integration/errors_test.rb | 2 +-
services/api/test/test_helper.rb | 4 +
46 files changed, 794 insertions(+), 519 deletions(-)
rename apps/workbench/test/{functional => controllers}/actions_controller_test.rb (100%)
rename apps/workbench/test/{functional => controllers}/api_client_authorizations_controller_test.rb (100%)
rename apps/workbench/test/{functional => controllers}/application_controller_test.rb (98%)
rename apps/workbench/test/{functional => controllers}/authorized_keys_controller_test.rb (100%)
rename apps/workbench/test/{functional => controllers}/groups_controller_test.rb (100%)
rename apps/workbench/test/{functional => controllers}/humans_controller_test.rb (100%)
rename apps/workbench/test/{functional => controllers}/job_tasks_controller_test.rb (100%)
rename apps/workbench/test/{functional => controllers}/jobs_controller_test.rb (100%)
rename apps/workbench/test/{functional => controllers}/keep_disks_controller_test.rb (100%)
rename apps/workbench/test/{functional => controllers}/links_controller_test.rb (100%)
rename apps/workbench/test/{functional => controllers}/logs_controller_test.rb (100%)
rename apps/workbench/test/{functional => controllers}/nodes_controller_test.rb (100%)
rename apps/workbench/test/{functional => controllers}/pipeline_templates_controller_test.rb (100%)
rename apps/workbench/test/{functional => controllers}/projects_controller_test.rb (100%)
rename apps/workbench/test/{functional => controllers}/repositories_controller_test.rb (100%)
rename apps/workbench/test/{functional => controllers}/sessions_controller_test.rb (100%)
rename apps/workbench/test/{functional => controllers}/specimens_controller_test.rb (100%)
rename apps/workbench/test/{functional => controllers}/traits_controller_test.rb (100%)
rename apps/workbench/test/{functional => controllers}/user_agreements_controller_test.rb (100%)
rename apps/workbench/test/{functional => controllers}/users_controller_test.rb (96%)
rename apps/workbench/test/{functional => controllers}/virtual_machines_controller_test.rb (100%)
delete mode 100644 apps/workbench/test/functional/.gitkeep
delete mode 100644 apps/workbench/test/functional/collections_controller_test.rb
delete mode 100644 apps/workbench/test/functional/pipeline_instances_controller_test.rb
create mode 100644 apps/workbench/test/helpers/pipeline_instances_helper_test.rb
create mode 100644 services/api/app/controllers/database_controller.rb
create mode 100644 services/api/app/models/database_seeds.rb
create mode 100644 services/api/test/functional/database_controller_test.rb
create mode 100644 services/api/test/integration/database_reset_test.rb
via ed0067ee9964c70f646a5f4f72c1302cc19c007c (commit)
via af3d57d7eeb458e598c9d3954942db7e1d28b780 (commit)
via fc2824f30bd7e87e85b6329cbb44d3c7259c2676 (commit)
via 9d281577e42c6f8411cc3ee9954134b771499624 (commit)
via f3460b2f2e8088e861d1852e4f26784b3c96ded8 (commit)
via 7e828d4672d2b306bccacfed309123c81846d565 (commit)
via 437d4225617df22b4e6d9c245f854620cdc09bc7 (commit)
via e3914c4981a48d086562bcdc45f0d385f95fc083 (commit)
via a69a1cb084e6feb9e4e9c6538a52289e7c56700b (commit)
via 76eaaac9fed4e74b8073ee08f99b84fc7922ac9f (commit)
via e65d698ab39cb44cf12630498ac75b475bedec44 (commit)
via bc206979ee82a00374838fff3044dcaf33338f02 (commit)
via 8f8a99ce94818a5dbe372d8704ab396bff897489 (commit)
via 75634adbcd7caebd58fad84f74feb5e1152a1254 (commit)
via 13efb6304b9fcbe0fd3b496c751184c7aa1cc4d0 (commit)
via 3167e5659918f4679d48bcc7f1fda4c3e4ef096f (commit)
via 8bb852474590b57c2476b0972100c4659dc60815 (commit)
via c0d9c656eefcb684c72fd2a1bca20b8b9c60df96 (commit)
via 14f2906a390d957bc17a9951667daf1eada37e47 (commit)
via 524fba52b54d45e905d0b6603d45b6442f7813fe (commit)
via d99ef829ba0fce58c3ba928ad2a2aefeb7f9a0ac (commit)
from 4b0934a2bb95509468fc4b6132177d47cc7988a8 (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 ed0067ee9964c70f646a5f4f72c1302cc19c007c
Merge: 4b0934a af3d57d
Author: Tom Clegg <tom at curoverse.com>
Date: Mon Dec 1 14:39:44 2014 -0500
Merge branch '4533-remote-reset' closes #4533
Conflicts:
apps/workbench/Gemfile.lock
diff --cc apps/workbench/Gemfile.lock
index 1d92e2f,58fe339..7575143
--- a/apps/workbench/Gemfile.lock
+++ b/apps/workbench/Gemfile.lock
@@@ -116,26 -116,23 +116,25 @@@ GE
multi_json (>= 1.5)
launchy (2.4.3)
addressable (~> 2.3)
- less (2.4.0)
+ less (2.6.0)
commonjs (~> 0.2.7)
- less-rails (2.4.2)
+ less-rails (2.6.0)
actionpack (>= 3.1)
- less (~> 2.4.0)
- libv8 (3.16.14.3)
- mail (2.5.4)
- mime-types (~> 1.16)
- treetop (~> 1.4.8)
+ less (~> 2.6.0)
+ libv8 (3.16.14.7)
+ mail (2.6.3)
+ mime-types (>= 1.16, < 3)
metaclass (0.0.4)
- mime-types (1.25.1)
- mini_portile (0.6.0)
- minitest (5.3.3)
+ mime-types (2.4.3)
+ mini_portile (0.6.1)
+ minitest (5.4.3)
mocha (1.1.0)
metaclass (~> 0.0.1)
+ morrisjs-rails (0.5.1)
+ railties (> 3.1, < 5)
- multi_json (1.10.0)
+ multi_json (1.10.1)
multipart-post (1.2.0)
- net-scp (1.1.2)
+ net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-sftp (2.1.2)
net-ssh (>= 2.6.5)
@@@ -161,40 -158,38 +160,39 @@@
rack (1.5.2)
rack-test (0.6.2)
rack (>= 1.0)
- rails (4.1.1)
- actionmailer (= 4.1.1)
- actionpack (= 4.1.1)
- actionview (= 4.1.1)
- activemodel (= 4.1.1)
- activerecord (= 4.1.1)
- activesupport (= 4.1.1)
+ rails (4.1.8)
+ actionmailer (= 4.1.8)
+ actionpack (= 4.1.8)
+ actionview (= 4.1.8)
+ activemodel (= 4.1.8)
+ activerecord (= 4.1.8)
+ activesupport (= 4.1.8)
bundler (>= 1.3.0, < 2.0)
- railties (= 4.1.1)
+ railties (= 4.1.8)
sprockets-rails (~> 2.0)
- railties (4.1.1)
- actionpack (= 4.1.1)
- activesupport (= 4.1.1)
+ railties (4.1.8)
+ actionpack (= 4.1.8)
+ activesupport (= 4.1.8)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
- rake (10.3.1)
- rake (10.3.2)
++ rake (10.4.0)
+ raphael-rails (2.1.2)
ref (1.0.5)
ruby-debug-passenger (0.2.0)
- rubyzip (1.1.0)
- rvm-capistrano (1.5.1)
+ rubyzip (1.1.6)
+ rvm-capistrano (1.5.5)
capistrano (~> 2.15.4)
- sass (3.2.12)
- sass-rails (4.0.3)
+ sass (3.2.19)
+ sass-rails (4.0.4)
railties (>= 4.0.0, < 5.0)
- sass (~> 3.2.0)
- sprockets (~> 2.8, <= 2.11.0)
+ sass (~> 3.2.2)
+ sprockets (~> 2.8, < 2.12)
sprockets-rails (~> 2.0)
- selenium-webdriver (2.40.0)
- childprocess (>= 0.5.0)
+ selenium-webdriver (2.44.0)
+ childprocess (~> 0.5)
multi_json (~> 1.0)
rubyzip (~> 1.0)
- websocket (~> 1.0.4)
+ websocket (~> 1.0)
signet (0.4.5)
addressable (>= 2.2.3)
faraday (~> 0.8.1)
diff --cc services/api/app/models/database_seeds.rb
index 0000000,5a6d875..0c98f8f
mode 000000,100644..100644
--- a/services/api/app/models/database_seeds.rb
+++ b/services/api/app/models/database_seeds.rb
@@@ -1,0 -1,12 +1,11 @@@
+ class DatabaseSeeds
+ include CurrentApiClient
+ def self.install
+ system_user
+ system_group
+ all_users_group
+ anonymous_group
+ anonymous_user
+ empty_collection
+ end
+ end
-
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list