qbwc 1.0.0 → 1.2.0

data/gemfiles/rails_7.1.gemfile.lock

@@ -0,0 +1,292 @@
+PATH
+  remote: ..
+  specs:
+    qbwc (1.1.0)
+      actionpack (>= 5.0.1)
+      qbxml (>= 0.3.0)
+      wash_out (>= 0.12.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+      zeitwerk (~> 2.6)
+    actionmailbox (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      activejob (= 7.1.5.1)
+      activerecord (= 7.1.5.1)
+      activestorage (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
+      mail (>= 2.7.1)
+      net-imap
+      net-pop
+      net-smtp
+    actionmailer (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      actionview (= 7.1.5.1)
+      activejob (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
+      mail (~> 2.5, >= 2.5.4)
+      net-imap
+      net-pop
+      net-smtp
+      rails-dom-testing (~> 2.2)
+    actionpack (7.1.5.1)
+      actionview (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
+      nokogiri (>= 1.8.5)
+      racc
+      rack (>= 2.2.4)
+      rack-session (>= 1.0.1)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    actiontext (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      activerecord (= 7.1.5.1)
+      activestorage (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
+      globalid (>= 0.6.0)
+      nokogiri (>= 1.8.5)
+    actionview (7.1.5.1)
+      activesupport (= 7.1.5.1)
+      builder (~> 3.1)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    activejob (7.1.5.1)
+      activesupport (= 7.1.5.1)
+      globalid (>= 0.3.6)
+    activemodel (7.1.5.1)
+      activesupport (= 7.1.5.1)
+    activerecord (7.1.5.1)
+      activemodel (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
+      timeout (>= 0.4.0)
+    activestorage (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      activejob (= 7.1.5.1)
+      activerecord (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
+      marcel (~> 1.0)
+    activesupport (7.1.5.1)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
+      minitest (>= 5.1)
+      mutex_m
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    akami (1.3.3)
+      base64
+      gyoku (>= 0.4.0)
+      nokogiri
+    appraisal (2.5.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    base64 (0.2.0)
+    benchmark (0.4.0)
+    bigdecimal (3.1.9)
+    builder (3.3.0)
+    byebug (11.1.3)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.0)
+    crack (1.0.0)
+      bigdecimal
+      rexml
+    crass (1.0.6)
+    date (3.4.1)
+    diff-lcs (1.6.0)
+    drb (2.2.1)
+    erubi (1.13.1)
+    faraday (2.12.2)
+      faraday-net_http (>= 2.0, < 3.5)
+      json
+      logger
+    faraday-net_http (3.4.0)
+      net-http (>= 0.5.0)
+    globalid (1.2.1)
+      activesupport (>= 6.1)
+    gyoku (1.4.0)
+      builder (>= 2.1.2)
+      rexml (~> 3.0)
+    hashdiff (1.1.2)
+    httpi (4.0.4)
+      base64
+      mutex_m
+      nkf
+      rack (>= 2.0, < 4)
+    i18n (1.14.7)
+      concurrent-ruby (~> 1.0)
+    io-console (0.8.0)
+    irb (1.15.1)
+      pp (>= 0.6.0)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
+    json (2.10.2)
+    logger (1.6.6)
+    loofah (2.24.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.12.0)
+    mail (2.8.1)
+      mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
+    marcel (1.0.4)
+    mini_mime (1.1.5)
+    mini_portile2 (2.8.8)
+    minitest (5.25.5)
+    mutex_m (0.3.0)
+    net-http (0.6.0)
+      uri
+    net-imap (0.4.19)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.2)
+      timeout
+    net-smtp (0.5.1)
+      net-protocol
+    nio4r (2.7.4)
+    nkf (0.2.0)
+    nokogiri (1.17.2-x86_64-linux)
+      racc (~> 1.4)
+    nori (2.7.1)
+      bigdecimal
+    pp (0.6.2)
+      prettyprint
+    prettyprint (0.2.0)
+    psych (5.2.3)
+      date
+      stringio
+    public_suffix (6.0.1)
+    qbxml (0.5.0)
+      activesupport (>= 5.0.0)
+      builder (~> 3.0)
+      nokogiri (~> 1.5)
+    racc (1.8.1)
+    rack (3.1.12)
+    rack-session (2.1.0)
+      base64 (>= 0.1.0)
+      rack (>= 3.0.0)
+    rack-test (2.2.0)
+      rack (>= 1.3)
+    rackup (2.2.1)
+      rack (>= 3)
+    rails (7.1.5.1)
+      actioncable (= 7.1.5.1)
+      actionmailbox (= 7.1.5.1)
+      actionmailer (= 7.1.5.1)
+      actionpack (= 7.1.5.1)
+      actiontext (= 7.1.5.1)
+      actionview (= 7.1.5.1)
+      activejob (= 7.1.5.1)
+      activemodel (= 7.1.5.1)
+      activerecord (= 7.1.5.1)
+      activestorage (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
+      bundler (>= 1.15.0)
+      railties (= 7.1.5.1)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.6.2)
+      loofah (~> 2.21)
+      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
+    railties (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
+      irb
+      rackup (>= 1.0.0)
+      rake (>= 12.2)
+      thor (~> 1.0, >= 1.2.2)
+      zeitwerk (~> 2.6)
+    rake (13.2.1)
+    rdoc (6.12.0)
+      psych (>= 4.0.0)
+    reline (0.6.0)
+      io-console (~> 0.5)
+    rexml (3.4.1)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.3)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.2)
+    savon (2.15.1)
+      akami (~> 1.2)
+      builder (>= 2.1.2)
+      gyoku (~> 1.2)
+      httpi (>= 4, < 5)
+      mail (~> 2.5)
+      nokogiri (>= 1.8.1)
+      nori (~> 2.4)
+      wasabi (>= 3.7, < 6)
+    securerandom (0.3.2)
+    sqlite3 (2.0.4)
+      mini_portile2 (~> 2.8.0)
+    stringio (3.1.5)
+    thor (1.3.2)
+    timeout (0.4.3)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    uri (1.0.3)
+    wasabi (5.1.0)
+      addressable
+      faraday (>= 1.9, < 3)
+      nokogiri (>= 1.13.9)
+    wash_out (0.12.0)
+      nori (>= 2.0.0)
+    webmock (3.25.1)
+      addressable (>= 2.8.0)
+      crack (>= 0.3.2)
+      hashdiff (>= 0.4.0, < 2.0.0)
+    websocket-driver (0.7.7)
+      base64
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
+    zeitwerk (2.6.18)
+
+PLATFORMS
+  x86_64-linux
+
+DEPENDENCIES
+  actionpack (~> 7.1.0)
+  actionview (~> 7.1.0)
+  activerecord
+  appraisal
+  byebug
+  httpi
+  minitest
+  qbwc!
+  rails (>= 5.0.1, < 7.2)
+  rake
+  rspec
+  savon
+  sqlite3
+  webmock
+
+BUNDLED WITH
+   2.4.13

data/lib/generators/qbwc/install/templates/db/migrate/change_request_index.rb

@@ -1,4 +1,4 @@
-class ChangeRequestIndex < ActiveRecord::Migration
+class ChangeRequestIndex < ActiveRecord::Migration[5.0]
   def change
     change_column :qbwc_jobs, :request_index, :text, null: true, default: nil
   end

data/lib/generators/qbwc/install/templates/db/migrate/create_qbwc_jobs.rb

@@ -1,4 +1,4 @@
-class CreateQbwcJobs < ActiveRecord::Migration
+class CreateQbwcJobs < ActiveRecord::Migration[5.0]
   def change
     create_table :qbwc_jobs, :force => true do |t|
       t.string :name

data/lib/generators/qbwc/install/templates/db/migrate/create_qbwc_sessions.rb

@@ -1,4 +1,4 @@
-class CreateQbwcSessions < ActiveRecord::Migration
+class CreateQbwcSessions < ActiveRecord::Migration[5.0]
   def change
     create_table :qbwc_sessions, :force => true do |t|
       t.string :ticket
@@ -8,7 +8,7 @@ class CreateQbwcSessions < ActiveRecord::Migration
       t.string :current_job
       t.string :iterator_id
       t.string :error, :limit => 1000
-      t.string :pending_jobs, :limit => 1000, :null => false, :default => ''
+      t.text :pending_jobs, :null => false, :default => ''
 
       t.timestamps :null => false
     end

data/lib/generators/qbwc/install/templates/db/migrate/index_qbwc_jobs.rb

@@ -1,4 +1,4 @@
-class IndexQbwcJobs < ActiveRecord::Migration
+class IndexQbwcJobs < ActiveRecord::Migration[5.0]
   def change
     add_index :qbwc_jobs, :name, unique: true
     add_index :qbwc_jobs, :company, length: 150

data/lib/generators/qbwc/install/templates/db/migrate/session_pending_jobs_text.rb

@@ -1,4 +1,4 @@
-class SessionPendingJobsText < ActiveRecord::Migration
+class SessionPendingJobsText < ActiveRecord::Migration[5.0]
   def change
     change_column_default(:qbwc_sessions, :pending_jobs, nil)
     change_column :qbwc_sessions, :pending_jobs, :text, :limit => 1000, :null => false

data/lib/qbwc/active_record/job.rb

@@ -1,8 +1,15 @@
 class QBWC::ActiveRecord::Job < QBWC::Job
   class QbwcJob < ActiveRecord::Base
-    validates :name, :uniqueness => true, :presence => true
-    serialize :requests, Hash
-    serialize :request_index, Hash
+    validates :name, :uniqueness => { :case_sensitive => true }, :presence => true
+
+    if Rails.version >= '6.1'
+      serialize :requests, type: Hash
+      serialize :request_index, type: Hash
+    else
+      serialize :requests, Hash
+      serialize :request_index, Hash
+    end
+
     serialize :data
 
     def to_qbwc_job

data/lib/qbwc/controller.rb

@@ -9,10 +9,10 @@ module QBWC
 
     def self.included(base)
       base.class_eval do
-        include WashOut::SOAP
-        skip_before_filter :_parse_soap_parameters, :_authenticate_wsse, :_map_soap_parameters, :only => :qwc
-        before_filter :get_session, :except => [:qwc, :authenticate, :_generate_wsdl]
-        after_filter :save_session, :except => [:qwc, :authenticate, :_generate_wsdl, :close_connection, :connection_error]
+        soap_service
+        skip_before_action :_authenticate_wsse, :_map_soap_parameters, :only => :qwc
+        before_action :get_session, :except => [:qwc, :authenticate, :_generate_wsdl]
+        after_action :save_session, :except => [:qwc, :authenticate, :_generate_wsdl, :close_connection, :connection_error]
 
         # wash_out changed the format of app/views/wash_with_soap/rpc/response.builder in commit
         # https://github.com/inossidabile/wash_out/commit/24a77f4a3d874562732c6e8c3a30e8defafea7cb
@@ -77,7 +77,7 @@ SB
    <AppURL>#{qbwc_action_url(:only_path => false)}</AppURL>
    <AppDescription>Quickbooks integration</AppDescription>
    <AppSupport>#{QBWC.support_site_url || root_url(:protocol => 'https://')}</AppSupport>
-   <UserName>#{@username || QBWC.username}</UserName>
+   <UserName>#{QBWC.username}</UserName>
    <OwnerID>#{QBWC.owner_id}</OwnerID>
    <FileID>{#{file_id}}</FileID>
    <QBType>QBFS</QBType>
@@ -85,7 +85,7 @@ SB
    #{scheduler_block}
 </QBWCXML>
 QWC
-      send_data qwc, :filename => "#{@filename || Rails.application.class.parent_name}.qwc", :content_type => 'application/x-qwc'
+      send_data qwc, :filename => "#{Rails.application.class.try(:module_parent_name) || Rails.application.class.parent_name}.qwc", :content_type => 'application/x-qwc'
     end
 
     class StringArray < WashOut::Type
@@ -162,7 +162,7 @@ QWC
     end
 
     def app_name
-      "#{Rails.application.class.parent_name} #{Rails.env} #{@app_name_suffix}"
+      "#{Rails.application.class.try(:module_parent_name) || Rails.application.class.parent_name} #{Rails.env}"
     end
 
     def file_id

data/lib/qbwc/job.rb

@@ -23,10 +23,10 @@ class QBWC::Job
 
   def process_response(qbxml_response, response, session, advance)
     QBWC.logger.info "Processing response."
+    QBWC.logger.info "Job '#{name}' received response: '#{qbxml_response}'." if QBWC.log_requests_and_responses
     request_list = requests(session)
     completed_request = request_list[request_index(session)] if request_list
     advance_next_request(session) if advance
-    QBWC.logger.info "Job '#{name}' received response: '#{qbxml_response}'." if QBWC.log_requests_and_responses
     worker.handle_response(response, session, self, completed_request, data)
   end
 

data/lib/qbwc/session.rb

@@ -18,7 +18,7 @@ class QBWC::Session
     @iterator_id = nil
     @initial_job_count = pending_jobs.length
 
-    @ticket = ticket || Digest::SHA1.hexdigest("#{Rails.application.config.secret_token}#{Time.now.to_i}")
+    @ticket = ticket || Digest::SHA1.hexdigest("#{Rails.application.config.try(:secret_key_base) || Rails.application.config.try(:secret_token)}#{SecureRandom.uuid}")
 
     @@session = self
     reset(ticket.nil?)
@@ -61,8 +61,9 @@ class QBWC::Session
     request = self.next_request
     if request && self.iterator_id.present?
       request = request.to_hash
+      requestID = request.values.first["xml_attributes"]["requestID"]
       request.delete('xml_attributes')
-      request.values.first['xml_attributes'] = {'iterator' => 'Continue', 'iteratorID' => self.iterator_id}
+      request.values.first['xml_attributes'] = {'iterator' => 'Continue', 'iteratorID' => self.iterator_id, 'requestID' => requestID}
       request = QBWC::Request.new(request)
     end 
     request

data/lib/qbwc/version.rb

@@ -1,3 +1,3 @@
 module QBWC
-  VERSION = "1.0.0"
+  VERSION = "1.2.0"
 end

data/qbwc.gemspec

@@ -22,18 +22,21 @@ Gem::Specification.new do |s|
     "README.md"
   ]
 
+  s.required_ruby_version = '>= 2.2.2'
+
   s.add_dependency "qbxml", [">= 0.3.0"]
-  s.add_dependency "wash_out", [">= 0.7.1"]
+  s.add_dependency "wash_out", ['>=0.12.0']
+  s.add_dependency 'actionpack', ['>= 5.0.1']
 
-  s.add_development_dependency('guard')
-  s.add_development_dependency('guard-rspec')
-  s.add_development_dependency('rb-fsevent')
   s.add_development_dependency('webmock')
   s.add_development_dependency('rspec')
   s.add_development_dependency('activerecord')
-  s.add_development_dependency('actionpack')
-  s.add_development_dependency('rails', [">= 4.1.0"])
+  s.add_development_dependency('rails', [">= 5.0.1", '< 7.2'])
   s.add_development_dependency('sqlite3')
   s.add_development_dependency('minitest')
   s.add_development_dependency('rake')
+  s.add_development_dependency('appraisal')
+  s.add_development_dependency('savon')
+  s.add_development_dependency('httpi')
+  s.add_development_dependency('byebug')
 end

data/test/qbwc/controllers/controller_test.rb

@@ -8,6 +8,7 @@ class QBWCControllerTest < ActionController::TestCase
 
   def setup
     @routes = Rails.application.routes  # https://github.com/blowmage/minitest-rails/issues/133#issuecomment-36401436
+    ActiveRecord::Base.yaml_column_permitted_classes += [Symbol] if ActiveRecord::Base.respond_to?(:yaml_column_permitted_classes)
     @controller = QbwcController.new    # http://stackoverflow.com/a/7743176
     @session = QBWC::Session.new('foo', '')
 
@@ -31,13 +32,18 @@ class QBWCControllerTest < ActionController::TestCase
     #_inspect_routes
     process(:qwc)
 
-    assert_match /QBWCXML/,                                                 @response.body
-    assert_match Regexp.new("AppName.*QbwcTestApplication #{Rails.env}.*AppName"),       @response.body
-    assert_match /AppURL.*http:\/\/test.host\/qbwc\/action.*AppURL/,        @response.body
-    assert_match /AppDescription.*Quickbooks integration.*AppDescription/,  @response.body
-    assert_match /AppSupport.*https:\/\/test.host\/.*AppSupport/,           @response.body
-    assert_match /UserName.*#{QBWC_USERNAME}.*UserName/,                    @response.body
-    assert_match /FileID.*{90A44FB5-33D9-4815-AC85-BC87A7E7D1EB}.*FileID/,  @response.body
+    assert_match(/QBWCXML/,                                                 @response.body)
+    assert_match(Regexp.new("AppName.*QbwcTestApplication #{Rails.env}.*AppName"),       @response.body)
+    assert_match(/AppURL.*http:\/\/test.host\/qbwc\/action.*AppURL/,        @response.body)
+    assert_match(/AppDescription.*Quickbooks integration.*AppDescription/,  @response.body)
+    assert_match(/AppSupport.*https:\/\/test.host\/.*AppSupport/,           @response.body)
+    assert_match(/UserName.*#{QBWC_USERNAME}.*UserName/,                    @response.body)
+    assert_match(/FileID.*{90A44FB5-33D9-4815-AC85-BC87A7E7D1EB}.*FileID/,  @response.body)
+  end
+
+  test "server_version" do
+    _simulate_soap_request('server_version', SERVER_VERSION_SOAP_ACTION, SERVER_VERSION_PARAMS)
+    assert_match(/tns:serverVersionResult/, @response.body)
   end
 
   test "authenticate with no jobs" do
@@ -101,7 +107,7 @@ class QBWCControllerTest < ActionController::TestCase
     _authenticate_with_queued_job
     _simulate_soap_request('receive_response', RECEIVE_RESPONSE_SOAP_ACTION, RECEIVE_RESPONSE_PARAMS)
 
-    assert_match /tns:receiveResponseXMLResult.*100..tns:receiveResponseXMLResult/, @response.body
+    assert_match(/tns:receiveResponseXMLResult.*100..tns:receiveResponseXMLResult/, @response.body)
   end
 
   class CheckErrorValuesWorker < QBWC::Worker
@@ -137,7 +143,7 @@ class QBWCControllerTest < ActionController::TestCase
     _simulate_soap_request('receive_response', RECEIVE_RESPONSE_SOAP_ACTION, RECEIVE_RESPONSE_ERROR_PARAMS)
 
     assert $HANDLE_RESPONSE_EXECUTED  # https://github.com/skryl/qbwc/pull/50#discussion_r23764154
-    assert_match /tns:receiveResponseXMLResult.*#{receive_response_xml_result}..tns:receiveResponseXMLResult/, @response.body
+    assert_match(/tns:receiveResponseXMLResult.*#{receive_response_xml_result}..tns:receiveResponseXMLResult/, @response.body)
   end
 
   test "receive_response error stop" do

data/test/qbwc/integration/job_management_test.rb

@@ -50,7 +50,7 @@ class JobManagementTest < ActionDispatch::IntegrationTest
 
   test "requests with default session" do
     job = QBWC.add_job(:integration_test, true, '', QBWC::Worker)
-    session = QBWC::Session.new('foo', '')
+    QBWC::Session.new('foo', '')
     assert_nil job.requests
   end
 
@@ -62,7 +62,7 @@ class JobManagementTest < ActionDispatch::IntegrationTest
 
   test "next_request with default session" do
     job = QBWC.add_job(:integration_test, true, '', QBWC::Worker)
-    session = QBWC::Session.new('foo', '')
+    QBWC::Session.new('foo', '')
     assert_nil job.next_request
   end
 

data/test/qbwc/integration/request_generation_test.rb

@@ -30,7 +30,7 @@ class RequestGenerationTest < ActionDispatch::IntegrationTest
 
   class SingleRequestWorker < QBWC::Worker
     def requests(job, session, data)
-      $SINGLE_REQUESTS_INVOKED_COUNT += 1 if $SINGLE_REQUESTS_INVOKED_COUNT.is_a?(Integer)
+      $SINGLE_REQUESTS_INVOKED_COUNT += 1 if defined?($SINGLE_REQUESTS_INVOKED_COUNT) && $SINGLE_REQUESTS_INVOKED_COUNT.is_a?(Integer)
       {:customer_query_rq => {:full_name => 'Quincy Bob William Carlos'}}
     end
   end
@@ -41,14 +41,14 @@ class RequestGenerationTest < ActionDispatch::IntegrationTest
     session = QBWC::Session.new('foo', '')
     nr = session.next_request
     assert_not_nil nr
-    assert_match /FullName.*Quincy Bob William Carlos.*FullName/, nr.request
+    assert_match(/FullName.*Quincy Bob William Carlos.*FullName/, nr.request)
     simulate_response(session)
     assert_nil session.next_request
   end
 
   class SingleStringRequestWorker < QBWC::Worker
     def requests(job, session, data)
-      $SINGLE_REQUESTS_INVOKED_COUNT += 1 if $SINGLE_REQUESTS_INVOKED_COUNT.is_a?(Integer)
+      $SINGLE_REQUESTS_INVOKED_COUNT += 1 if defined?($SINGLE_REQUESTS_INVOKED_COUNT) && $SINGLE_REQUESTS_INVOKED_COUNT.is_a?(Integer)
       QBWC_CUSTOMER_QUERY_RQ
     end
   end
@@ -59,7 +59,7 @@ class RequestGenerationTest < ActionDispatch::IntegrationTest
     session = QBWC::Session.new('foo', '')
     nr = session.next_request
     assert_not_nil nr
-    assert_match /FullName.*#{QBWC_USERNAME}.*FullName/, nr.request
+    assert_match(/FullName.*#{QBWC_USERNAME}.*FullName/, nr.request)
     simulate_response(session)
     assert_nil session.next_request
   end
@@ -130,17 +130,17 @@ class RequestGenerationTest < ActionDispatch::IntegrationTest
 
     req1 = session.next_request
     assert_not_nil req1
-    assert_match /xml.*FullName.*Quincy Bob William Carlos.*FullName/m, req1.request
+    assert_match(/xml.*FullName.*Quincy Bob William Carlos.*FullName/m, req1.request)
     simulate_response(session)
 
     req2 = session.next_request
     assert_not_nil req2
-    assert_match /xml.*FullName.*Quentin Billy Wyatt Charles.*FullName/m, req2.request
+    assert_match(/xml.*FullName.*Quentin Billy Wyatt Charles.*FullName/m, req2.request)
     simulate_response(session)
 
     req3 = session.next_request
     assert_not_nil req3
-    assert_match /xml.*FullName.*Quigley Brian Wally Colin.*FullName/m, req3.request
+    assert_match(/xml.*FullName.*Quigley Brian Wally Colin.*FullName/m, req3.request)
     simulate_response(session)
 
     assert_nil session.next_request
@@ -261,11 +261,11 @@ class RequestGenerationTest < ActionDispatch::IntegrationTest
     session = QBWC::Session.new('foo', '')
     request = session.next_request
     assert_not_nil request
-    assert_match /CustomerAddRq.*\/CustomerAddRq/m, request.request
+    assert_match(/CustomerAddRq.*\/CustomerAddRq/m, request.request)
     simulate_response(session)
     assert_nil session.next_request
 
-    assert_match /CustomerAddRq.*\/CustomerAddRq/m, extract_request(QBWC::ActiveRecord::Job::QbwcJob.first, session)[0]
+    assert_match(/CustomerAddRq.*\/CustomerAddRq/m, extract_request(QBWC::ActiveRecord::Job::QbwcJob.first, session)[0])
     QBWC.jobs.each {|job| assert job.requests_provided_when_job_added == true}
   end
 
@@ -296,7 +296,7 @@ class RequestGenerationTest < ActionDispatch::IntegrationTest
     session = QBWC::Session.new('foo', '')
     request = session.next_request
     assert_not_nil request
-    assert_match /FullName.#{QBWC_USERNAME}.\/FullName/, request.request
+    assert_match(/FullName.#{QBWC_USERNAME}.\/FullName/, request.request)
 
     expected = {[nil, ""] => [{:customer_query_rq => {:full_name => QBWC_USERNAME}}]}
     assert_equal expected, QBWC::ActiveRecord::Job::QbwcJob.first[:requests]
@@ -327,11 +327,11 @@ class RequestGenerationTest < ActionDispatch::IntegrationTest
 
     session = QBWC::Session.new('foo', '')
     request1 = session.next_request
-    assert_match /FullName.#{QBWC_USERNAME}.\/FullName/, request1.request
+    assert_match(/FullName.#{QBWC_USERNAME}.\/FullName/, request1.request)
     simulate_response(session)
 
     request2 = session.next_request
-    assert_match /FullName.usr2 name.\/FullName/, request2.request
+    assert_match(/FullName.usr2 name.\/FullName/, request2.request)
     simulate_response(session)
 
     assert_nil session.next_request

data/test/qbwc/integration/response_test.rb

@@ -30,6 +30,8 @@ class ResponseTest < ActionDispatch::IntegrationTest
 
     # Simulate controller authenticate
     ticket_string = QBWC::ActiveRecord::Session.new(QBWC_USERNAME, COMPANY).ticket
+    assert_not_nil(ticket_string)
+
     session = QBWC::Session.new(nil, COMPANY)
 
     responses.each do |resp|

data/test/qbwc/integration/routes_test.rb

@@ -21,12 +21,12 @@ class RoutesTest < ActionDispatch::IntegrationTest
     #_inspect_routes
     get '/qbwc/qwc'
 
-    assert_match /QBWCXML/,                                                 @response.body
-    assert_match Regexp.new("AppName.*QbwcTestApplication #{Rails.env}.*AppName"),       @response.body
-    assert_match /AppURL.*http:\/\/www.example.com\/qbwc\/action.*AppURL/,  @response.body
-    assert_match /AppDescription.*Quickbooks integration.*AppDescription/,  @response.body
-    assert_match /AppSupport.*https:\/\/www.example.com\/.*AppSupport/,     @response.body
-    assert_match /UserName.*#{QBWC_USERNAME}.*UserName/,        	    @response.body
+    assert_match(/QBWCXML/,                                                 @response.body)
+    assert_match(Regexp.new("AppName.*QbwcTestApplication #{Rails.env}.*AppName"),       @response.body)
+    assert_match(/AppURL.*http:\/\/www.example.com\/qbwc\/action.*AppURL/,  @response.body)
+    assert_match(/AppDescription.*Quickbooks integration.*AppDescription/,  @response.body)
+    assert_match(/AppSupport.*https:\/\/www.example.com\/.*AppSupport/,     @response.body)
+    assert_match(/UserName.*#{QBWC_USERNAME}.*UserName/,        	    @response.body)
   end
 
   test "qbwc/action without soap returns successfully" do