From 250ecb161140a253c305cb7c2b55e4f821befbdc Mon Sep 17 00:00:00 2001
From: Mark Wells <mark@freeside.biz>
Date: Wed, 27 Apr 2016 13:15:42 -0700
Subject: [PATCH] fix testing on 3.x

---
 FS-Test/share/htpasswd               |  1 +
 FS/t/suite/00-new_customer.t         | 14 +++++++-------
 httemplate/elements/header-full.html |  9 ---------
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/FS-Test/share/htpasswd b/FS-Test/share/htpasswd
index 08f5f815b..c059c47a5 100644
--- a/FS-Test/share/htpasswd
+++ b/FS-Test/share/htpasswd
@@ -1 +1,2 @@
 test:$apr1$jKrlUTN/$WxmsctMWNR5uVpOF9i7QB.
+admin:$apr1$MNKxe/4s$eXM3IraONkkHuCqEaSM/N/
diff --git a/FS/t/suite/00-new_customer.t b/FS/t/suite/00-new_customer.t
index 8e86459d1..efda0ad8c 100755
--- a/FS/t/suite/00-new_customer.t
+++ b/FS/t/suite/00-new_customer.t
@@ -36,13 +36,13 @@ my %params = (
   billday                 => '1',
   no_credit_limit         => 1,
   # payment method
-  custpaybynum0_payby         => 'CARD',
-  custpaybynum0_payinfo       => '4012888888881881',
-  custpaybynum0_paydate_month => '12',
-  custpaybynum0_paydate_year  => '2020',
-  custpaybynum0_paycvv        => '123',
-  custpaybynum0_payname       => '',
-  custpaybynum0_weight        => 1,
+  payby      => 'CARD',
+  payinfo    => '4012888888881881',
+  exp_month  => '12',
+  exp_year   => '2020',
+  paycvv     => '123',
+  payname    => '',
+  weight     => 1,
 );
 foreach (keys %params) {
   $form->value($_, $params{$_});
diff --git a/httemplate/elements/header-full.html b/httemplate/elements/header-full.html
index 9b2482859..a67538d11 100644
--- a/httemplate/elements/header-full.html
+++ b/httemplate/elements/header-full.html
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <%doc>
 
 Example:
@@ -241,11 +240,3 @@ if ( scalar(@agentnums) == 1 ) {
 }
 
 </%init>
-=======
-% # for testing, disable the page menus/search boxes
-% if ( $FS::CurrentUser::CurrentUser->option('header-minimal') ) {
-<& header-minimal.html, @_ &>
-% } else {
-<& header-full.html, @_ &>
-% }
->>>>>>> cb6214a... more robust testing platform, #37340
-- 
2.11.0