[ARVADOS] updated: 8cc7bf367214a6f423199b62ab153b431f21f2a7
git at public.curoverse.com
git at public.curoverse.com
Sun Aug 24 00:13:41 EDT 2014
Summary of changes:
.../app/assets/javascripts/report_issue.js | 55 ++++++++++------------
.../app/views/collections/_choose_rows.html.erb | 9 +++-
.../app/views/projects/_show_tab_contents.html.erb | 3 +-
apps/workbench/test/integration/errors_test.rb | 12 ++---
.../test/integration/report_issue_test.rb | 2 +-
apps/workbench/test/integration/search_box_test.rb | 12 ++---
.../app/controllers/arvados/v1/jobs_controller.rb | 4 +-
services/api/app/models/commit.rb | 15 ++++--
8 files changed, 62 insertions(+), 50 deletions(-)
via 8cc7bf367214a6f423199b62ab153b431f21f2a7 (commit)
via 3f94855e8f06d0c01ad9596f34a90e0c65e0be46 (commit)
via d68db5e4755eb38482f251fec92fa975feae667d (commit)
via f5783fd9242883b10dcd6e371597b798e1eecc5e (commit)
via db88e7487f1fca50e00c5fc004e67b922a41ad29 (commit)
via b6487d6773406f0da6724e24ad5ce6a94e1009cd (commit)
via 44064fd5fd15cf053603276438d19941f3d8e892 (commit)
via d85ec3b1d45863839186537c6c832732784d5689 (commit)
via 82b77ceb5b9fa5035fc44372fb090769e61adba0 (commit)
from f108142420e8d8376a822a8337074e084e8d90ca (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 8cc7bf367214a6f423199b62ab153b431f21f2a7
Author: radhika <radhika at curoverse.com>
Date: Sun Aug 24 00:12:44 2014 -0400
3112: update report_issue.js to confine event handling to report issue. WIP: mostly working, except from the 404 error page.
diff --git a/apps/workbench/app/assets/javascripts/report_issue.js b/apps/workbench/app/assets/javascripts/report_issue.js
index 482fd53..cc15b70 100644
--- a/apps/workbench/app/assets/javascripts/report_issue.js
+++ b/apps/workbench/app/assets/javascripts/report_issue.js
@@ -1,36 +1,33 @@
-// ajax handling for report-issue function
$(document).
- on('ajax:send', function() {
- var $sendButton = $('#report-issue-submit');
- if ($sendButton) {
- $sendButton.html('Sending...');
- $sendButton.attr('disabled',true);
- }
+ on('click', "#report-issue-submit", function(e){
+ $(this).html('Sending');
+ $(this).attr('disabled', true);
var $cancelButton = $('#report-issue-cancel');
if ($cancelButton) {
$cancelButton.html('Close');
}
$('div').remove('.modal-footer-status');
- }).
- on('ajax:success', function() {
- var $sendButton = $('#report-issue-submit');
- if ($sendButton && $sendButton.prop('disabled')) {
- $sendButton.html('Report sent');
- $('div').remove('.modal-footer-status');
- $('.modal-footer').append('<div class="modal-footer-status alert alert-success"><div><p align="left">Thanks for reporting this issue!</p></div></div>');
- }
- }).
- on('ajax:failure', function() {
- var $sendButton = $('#report-issue-submit');
- if ($sendButton && $sendButton.prop('disabled')) {
- $('div').remove('.modal-footer-status');
- $('.modal-footer').append('<div class="modal-footer-status alert alert-danger"></br><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');
- if ($cancelButton) {
- var text = document.getElementById('report-issue-cancel').firstChild;
- $cancelButton.html('Cancel');
- }
+
+ $.ajax().
+ success(function(data, status, jqxhr) {
+ var $sendButton = $('#report-issue-submit');
+ $sendButton.html('Report sent');
+ $('div').remove('.modal-footer-status');
+ $('.modal-footer').append('<div class="modal-footer-status alert alert-success"><div><p align="left">Thanks for reporting this issue!</p></div></div>');
+ }).
+ fail(function(jqxhr, status, error) {
+ var $sendButton = $('#report-issue-submit');
+ if ($sendButton && $sendButton.prop('disabled')) {
+ $('div').remove('.modal-footer-status');
+ $('.modal-footer').append('<div class="modal-footer-status alert alert-danger"></br><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');
+ }).
+ always(function(data, status, jqxhr) {
+ });
+
});
diff --git a/apps/workbench/test/integration/errors_test.rb b/apps/workbench/test/integration/errors_test.rb
index b5156b4..b800081 100644
--- a/apps/workbench/test/integration/errors_test.rb
+++ b/apps/workbench/test/integration/errors_test.rb
@@ -105,18 +105,18 @@ 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?('Server version'), 'Server version text not found'
- assert page.has_text?('Server restarted at'), 'Server restarted at text not found'
+ 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_button?('Report issue'), 'Report issue button not found'
+ assert page.has_button?('Send problem report'), 'Send problem report button not found'
assert page.has_button?('Cancel'), 'Cancel button not found'
# enter a report text and click on report
page.find_field('report_issue_text').set 'my test report text'
- click_button 'Report issue'
+ click_button 'Send problem report'
# ajax success updated button texts and added footer message
- assert page.has_no_button?('Report issue'), 'Found button - Report issue'
+ assert page.has_no_button?('Send problem report'), 'Found button - Send problem report'
assert page.has_no_button?('Cancel'), 'Found button - Cancel'
assert page.has_text?('Report sent'), 'No text - Report sent'
assert page.has_button?('Close'), 'No button - Close'
@@ -126,7 +126,7 @@ class ErrorsTest < ActionDispatch::IntegrationTest
end
# out of the popup now and should be back in the error page
- assert(page.has_text?(/fiddlesticks/i), 'Expected to be in error page')
+ assert(page.has_text?('Dashboard'), 'Expected to see dashboard')
ensure
Rails.configuration.arvados_v1_base = original_arvados_v1_base
end
diff --git a/apps/workbench/test/integration/report_issue_test.rb b/apps/workbench/test/integration/report_issue_test.rb
index fe87c58..c165a56 100644
--- a/apps/workbench/test/integration/report_issue_test.rb
+++ b/apps/workbench/test/integration/report_issue_test.rb
@@ -89,7 +89,7 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
['active_no_prefs_profile', api_fixture('users')['active_no_prefs_profile']],
].each do |token, user|
- test "check help for user #{token}" do
+ test "check version info and report issue for user #{token}" do
if !token
visit ('/')
else
diff --git a/apps/workbench/test/integration/search_box_test.rb b/apps/workbench/test/integration/search_box_test.rb
index be9931d..dcdce15 100644
--- a/apps/workbench/test/integration/search_box_test.rb
+++ b/apps/workbench/test/integration/search_box_test.rb
@@ -36,18 +36,18 @@ 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?('Server version'), 'No text - Server version'
- assert page.has_text?('Server restarted at'), 'No text - Server restarted at'
+ 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_button?('Report issue'), 'No button - Report issue'
+ assert page.has_button?('Send problem report'), 'No button - Send problem report'
assert page.has_button?('Cancel'), 'No button - Cancel'
# enter a report text and click on report
page.find_field('report_issue_text').set 'my test report text'
- click_button 'Report issue'
+ click_button 'Send problem report'
# ajax success updated button texts and added footer message
- assert page.has_no_button?('Report issue'), 'Found button - Report issue'
+ assert page.has_no_button?('Send problem report'), 'Found button - Send problem report'
assert page.has_no_button?('Cancel'), 'Found button - Cancel'
assert page.has_text?('Report sent'), 'No text - Report sent'
assert page.has_button?('Close'), 'No text - Close'
@@ -86,7 +86,7 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
['admin', api_fixture('users')['admin']],
].each do |token, user|
- test "test search for user #{token}" do
+ test "test search box for user #{token}" do
visit page_with_token(token)
verify_search_box user
commit 3f94855e8f06d0c01ad9596f34a90e0c65e0be46
Merge: f5783fd d68db5e
Author: radhika <radhika at curoverse.com>
Date: Fri Aug 22 16:22:32 2014 -0400
Merge branch 'master' into 3112-report-bug
commit f5783fd9242883b10dcd6e371597b798e1eecc5e
Merge: f108142 db88e74
Author: radhika <radhika at curoverse.com>
Date: Fri Aug 22 16:09:32 2014 -0400
Merge branch 'master' into 3112-report-bug
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list