[ARVADOS] updated: 7c91d6964f3afb96a737f4234ff45da13a6a4bc2
git at public.curoverse.com
git at public.curoverse.com
Mon Aug 25 17:32:20 EDT 2014
Summary of changes:
apps/workbench/app/assets/javascripts/report_issue.js | 11 +++++------
apps/workbench/config/routes.rb | 4 ++--
apps/workbench/test/integration/errors_test.rb | 6 +-----
apps/workbench/test/integration/report_issue_test.rb | 14 +++-----------
apps/workbench/test/integration/search_box_test.rb | 6 ++----
apps/workbench/test/integration/user_profile_test.rb | 2 +-
6 files changed, 14 insertions(+), 29 deletions(-)
via 7c91d6964f3afb96a737f4234ff45da13a6a4bc2 (commit)
via 59e8a18aef4164875cf43a0382db6a70671bf87f (commit)
from 3a43585742a41468abbd8a74511af6e2164bba1a (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 7c91d6964f3afb96a737f4234ff45da13a6a4bc2
Author: radhika <radhika at curoverse.com>
Date: Mon Aug 25 17:20:51 2014 -0400
3112: update issue report routes config and some other minor test updates.
diff --git a/apps/workbench/config/routes.rb b/apps/workbench/config/routes.rb
index 26c38ff..e58796e 100644
--- a/apps/workbench/config/routes.rb
+++ b/apps/workbench/config/routes.rb
@@ -10,8 +10,8 @@ ArvadosWorkbench::Application.routes.draw do
get '/user_agreements/signatures' => 'user_agreements#signatures'
get "users/setup_popup" => 'users#setup_popup', :as => :setup_user_popup
get "users/setup" => 'users#setup', :as => :setup_user
- get "actions/report_issue_popup" => 'actions#report_issue_popup', :as => :report_issue_popup
- post "actions/report_issue" => 'actions#report_issue', :as => :report_issue
+ get "report_issue_popup" => 'actions#report_issue_popup', :as => :report_issue_popup
+ post "report_issue" => 'actions#report_issue', :as => :report_issue
resources :nodes
resources :humans
resources :traits
diff --git a/apps/workbench/test/integration/errors_test.rb b/apps/workbench/test/integration/errors_test.rb
index b800081..de595e3 100644
--- a/apps/workbench/test/integration/errors_test.rb
+++ b/apps/workbench/test/integration/errors_test.rb
@@ -83,8 +83,6 @@ class ErrorsTest < ActionDispatch::IntegrationTest
end
test "API error page has Report problem button" do
- visit page_with_token("active")
-
original_arvados_v1_base = Rails.configuration.arvados_v1_base
begin
@@ -105,9 +103,7 @@ class ErrorsTest < ActionDispatch::IntegrationTest
within '.modal-content' do
assert page.has_text?('Report a problem'), 'Report a problem text not found'
assert page.has_no_text?('Version / debugging info'), 'Version / debugging info is not expected'
- assert page.has_text?('API version'), 'API version text not found'
- assert page.has_text?('API startup time'), 'API startup time text not found'
- assert page.has_text?('Found a problem?'), 'Found a problem text not found'
+ assert page.has_text?('Describe the problem'), 'Describe the problem text not found'
assert page.has_button?('Send problem report'), 'Send problem report button not found'
assert page.has_button?('Cancel'), 'Cancel button not found'
diff --git a/apps/workbench/test/integration/report_issue_test.rb b/apps/workbench/test/integration/report_issue_test.rb
index c165a56..cf41e23 100644
--- a/apps/workbench/test/integration/report_issue_test.rb
+++ b/apps/workbench/test/integration/report_issue_test.rb
@@ -2,7 +2,7 @@ require 'integration_helper'
require 'selenium-webdriver'
require 'headless'
-class ApplicationLayoutTest < ActionDispatch::IntegrationTest
+class ReportIssueTest < ActionDispatch::IntegrationTest
setup do
headless = Headless.new
headless.start
@@ -34,11 +34,7 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
within '.modal-content' do
assert page.has_text?('Version / debugging info'), 'No text - Version / debugging info'
assert page.has_no_text?('Report a problem'), 'Found text - Report a problem'
- assert page.has_text?('API version'), 'No text - API version'
- assert page.has_text?('API startup time'), 'No text - API startup time'
- assert page.has_text?('Workbench version'), 'No text - Workbench version'
- assert page.has_text?('Workbench URI'), 'No text - Arvados base'
- assert page.has_no_text?('Found a problem?'), 'Found text - Found a problem'
+ assert page.has_no_text?('Describe the problem?'), 'Found text - Describe the problem'
assert page.has_button?('Close'), 'No button - Close'
assert page.has_no_button?('Send problem report'), 'Found button - Send problem report'
click_button 'Close'
@@ -55,11 +51,7 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
within '.modal-content' do
assert page.has_text?('Report a problem'), 'No text - Report a problem'
assert page.has_no_text?('Version / debugging info'), 'Found text - Version / debugging info'
- assert page.has_text?('API version'), 'No text - API version'
- assert page.has_text?('API startup time'), 'No text - API startup time'
- assert page.has_text?('Workbench version'), 'No text - Workbench version'
- assert page.has_text?('Workbench URI'), 'No text - Arvados base'
- assert page.has_text?('Found a problem?'), 'No text - Found a problem'
+ assert page.has_text?('Describe the problem'), 'No text - Describe the problem'
assert page.has_no_button?('Close'), 'Found button - Close'
assert page.has_button?('Send problem report'), 'No button - Send problem report'
assert page.has_button?('Cancel'), 'No button - Cancel'
diff --git a/apps/workbench/test/integration/search_box_test.rb b/apps/workbench/test/integration/search_box_test.rb
index dcdce15..0cdfdc8 100644
--- a/apps/workbench/test/integration/search_box_test.rb
+++ b/apps/workbench/test/integration/search_box_test.rb
@@ -2,7 +2,7 @@ require 'integration_helper'
require 'selenium-webdriver'
require 'headless'
-class ApplicationLayoutTest < ActionDispatch::IntegrationTest
+class SearchBoxTest < ActionDispatch::IntegrationTest
setup do
headless = Headless.new
headless.start
@@ -36,9 +36,7 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
within '.modal-content' do
assert page.has_text?('Report a problem'), 'No text - Report a problem'
assert page.has_no_text?('Version / debugging info'), 'No text - Version / debugging info'
- assert page.has_text?('API version'), 'No text - API version'
- assert page.has_text?('API startup time'), 'No text - API startup time'
- assert page.has_text?('Found a problem?'), 'No text - Found a problem'
+ assert page.has_text?('Describe the problem'), 'No text - Describe the problem'
assert page.has_button?('Send problem report'), 'No button - Send problem report'
assert page.has_button?('Cancel'), 'No button - Cancel'
diff --git a/apps/workbench/test/integration/user_profile_test.rb b/apps/workbench/test/integration/user_profile_test.rb
index edee064..ede67ff 100644
--- a/apps/workbench/test/integration/user_profile_test.rb
+++ b/apps/workbench/test/integration/user_profile_test.rb
@@ -2,7 +2,7 @@ require 'integration_helper'
require 'selenium-webdriver'
require 'headless'
-class ApplicationLayoutTest < ActionDispatch::IntegrationTest
+class UserProfileTest < ActionDispatch::IntegrationTest
setup do
headless = Headless.new
headless.start
commit 59e8a18aef4164875cf43a0382db6a70671bf87f
Author: radhika <radhika at curoverse.com>
Date: Mon Aug 25 16:52:39 2014 -0400
3112: fix indentation
diff --git a/apps/workbench/app/assets/javascripts/report_issue.js b/apps/workbench/app/assets/javascripts/report_issue.js
index 15ff4bc..97ee939 100644
--- a/apps/workbench/app/assets/javascripts/report_issue.js
+++ b/apps/workbench/app/assets/javascripts/report_issue.js
@@ -18,13 +18,12 @@ $(document).
fail(function(jqxhr, status, error) {
var $sendButton = $('#report-issue-submit');
if ($sendButton && $sendButton.prop('disabled')) {
- $('div').remove('.modal-footer-status');
- $('.modal-footer').append('<div><br/></div><div class="modal-footer-status alert alert-danger"><p align="left">We are sorry. We could not submit your report! We really want this to work, though -- please try again.</p></div>');
- $sendButton.html('Send problem report');
- $sendButton.attr('disabled',false);
- }
+ $('div').remove('.modal-footer-status');
+ $('.modal-footer').append('<div><br/></div><div class="modal-footer-status alert alert-danger"><p align="left">We are sorry. We could not submit your report! We really want this to work, though -- please try again.</p></div>');
+ $sendButton.html('Send problem report');
+ $sendButton.attr('disabled',false);
+ }
var $cancelButton = $('#report-issue-cancel');
- var text = document.getElementById('report-issue-cancel').firstChild;
$cancelButton.html('Cancel');
});
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list