[ARVADOS] updated: 44690743d580cc99403ffff280411f029ac975dd
git at public.curoverse.com
git at public.curoverse.com
Sun Mar 8 23:51:05 EDT 2015
Summary of changes:
apps/workbench/Gemfile | 2 ++
apps/workbench/Gemfile.lock | 2 ++
apps/workbench/app/assets/javascripts/application.js | 1 +
apps/workbench/test/integration/report_issue_test.rb | 18 +++++++++++-------
4 files changed, 16 insertions(+), 7 deletions(-)
via 44690743d580cc99403ffff280411f029ac975dd (commit)
from 6058d8a2af0a7461f9a412b1b69948e4d0e9224f (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 44690743d580cc99403ffff280411f029ac975dd
Author: Radhika Chippada <radhika at curoverse.com>
Date: Sun Mar 8 23:37:12 2015 -0400
5105: report issue was not working in chrome. added remotipart which resolved this issue.
diff --git a/apps/workbench/Gemfile b/apps/workbench/Gemfile
index d3746a8..5e195d9 100644
--- a/apps/workbench/Gemfile
+++ b/apps/workbench/Gemfile
@@ -60,6 +60,8 @@ gem 'bootstrap-tab-history-rails'
gem 'angularjs-rails'
+gem 'remotipart'
+
gem 'less'
gem 'less-rails'
gem 'wiselinks'
diff --git a/apps/workbench/Gemfile.lock b/apps/workbench/Gemfile.lock
index 9a88697..0143a93 100644
--- a/apps/workbench/Gemfile.lock
+++ b/apps/workbench/Gemfile.lock
@@ -190,6 +190,7 @@ GEM
rake
raphael-rails (2.1.2)
ref (1.0.5)
+ remotipart (1.2.1)
ruby-debug-passenger (0.2.0)
ruby-prof (0.15.2)
rubyzip (1.1.6)
@@ -284,6 +285,7 @@ DEPENDENCIES
rails (~> 4.1.0)
rails-perftest
raphael-rails
+ remotipart
ruby-debug-passenger
ruby-prof
rvm-capistrano
diff --git a/apps/workbench/app/assets/javascripts/application.js b/apps/workbench/app/assets/javascripts/application.js
index 63887b3..8de0691 100644
--- a/apps/workbench/app/assets/javascripts/application.js
+++ b/apps/workbench/app/assets/javascripts/application.js
@@ -27,6 +27,7 @@
//= require raphael
//= require morris
//= require jquery.number.min
+//= require jquery.remotipart
//= require_tree .
jQuery(function($){
diff --git a/apps/workbench/test/integration/report_issue_test.rb b/apps/workbench/test/integration/report_issue_test.rb
index 4a15851..cf39fef 100644
--- a/apps/workbench/test/integration/report_issue_test.rb
+++ b/apps/workbench/test/integration/report_issue_test.rb
@@ -12,6 +12,8 @@ class ReportIssueTest < ActionDispatch::IntegrationTest
# test version info and report issue from help menu
def check_version_info_and_report_issue_from_help_menu
+ ActionMailer::Base.deliveries = []
+
within '.navbar-fixed-top' do
find('.help-menu > a').click
within '.help-menu .dropdown-menu' do
@@ -60,10 +62,6 @@ class ReportIssueTest < ActionDispatch::IntegrationTest
page.find_field('report_issue_text').set 'my test report text'
assert page.has_button?('Send problem report'), 'Send problem report button not enabled after entering text'
- report = mock
- report.expects(:deliver).returns true
- IssueReporter.expects(:send_report).returns report
-
click_button 'Send problem report'
# ajax success updated button texts and added footer message
@@ -74,6 +72,15 @@ class ReportIssueTest < ActionDispatch::IntegrationTest
assert page.has_text?('Thanks for reporting this issue'), 'No text - Thanks for reporting this issue'
click_button 'Close'
+
+ # verify report email
+ found_email = 0
+ ActionMailer::Base.deliveries.each do |email|
+ if email.subject.include?("Issue reported")
+ found_email += 1
+ end
+ end
+ assert_equal 1, found_email, "Expected email after reporting issue"
end
end
@@ -86,7 +93,6 @@ class ReportIssueTest < ActionDispatch::IntegrationTest
['active_no_prefs', api_fixture('users')['active_no_prefs']],
['active_no_prefs_profile', api_fixture('users')['active_no_prefs_profile']],
].each do |token, user|
-
test "check version info and report issue for user #{token}" do
if !token
visit ('/')
@@ -96,7 +102,5 @@ class ReportIssueTest < ActionDispatch::IntegrationTest
check_version_info_and_report_issue_from_help_menu
end
-
end
-
end
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list