Squashed commit of the following:

commit da75cb14091d6faa11c94655e197f5b571d0dada
Author: Nancy Kimble <nkk4@cornell.edu>
Date:   Mon Aug 18 18:14:12 2014 -0400

    [KFSQA-1012] Fix for KFSQA-970 needed after KFSQA-1012 changes made.

commit dfacc2489598132f3ce7f2872df220211f5cbee5
Author: Nancy Kimble <nkk4@cornell.edu>
Date:   Mon Aug 18 16:32:21 2014 -0400

    [KFSQA-1012] Changes to implement this test.

commit a10e0c1418068ef562ba1bc37eb5f77fcdc3bdc4
Author: Tony <tony@rsmart.com>
Date:   Fri Aug 15 12:25:31 2014 -0400

    timing issue with a test, submit was being checked wrong

commit fd5cabef02d0bc1c0b02193db0b1cc1d75cc1f97
Author: Tony <tony@rsmart.com>
Date:   Fri Aug 15 12:12:57 2014 -0400

    changed to avoid problems with expired insurance dates  [KFSQA-1014]

commit 172aa3cacbbc791d02fa6769ddddb4fd97ae716c
Merge: d4ed1d3 fb027f0
Author: lshyu <lshyu@vivantech.com>
Date:   Wed Aug 13 13:28:50 2014 -0400

    [KFSQA-1054] merged from master

commit d4ed1d3e9538dcf178a53a241f63b3f48fbd98d9
Merge: 0ab4d2a b31f065
Author: lshyu <lshyu@vivantech.com>
Date:   Wed Aug 13 11:38:07 2014 -0400

    [KFSQA-1054] merged from master

commit fb027f06b9be482db1c242469e58f2f0b62277d4
Merge: c4423a2 b31f065
Author: lshyu <lshyu@vivantech.com>
Date:   Wed Aug 13 10:43:44 2014 -0400

    [KFSQA-1011] merged from master

commit c4423a270f42ed5d67712252fabbd43fff3c93a8
Author: lshyu <lshyu@vivantech.com>
Date:   Tue Aug 12 16:35:06 2014 -0400

    [KFSQA-1011] move step more appropriate in routing

commit 568e114897a1feda21b80f767622bb9e0ea60eb6
Author: lshyu <lshyu@vivantech.com>
Date:   Tue Aug 12 16:10:05 2014 -0400

    [KFSQA-1011] move 'gsub' for item quantity

commit b31f0656599e9c44a6d9739abe5157cc5a36eae9
Author: Tony <tony@rsmart.com>
Date:   Tue Aug 12 15:12:32 2014 -0400

    refactoring hard coded data [KFSQA-1065]

commit 21a9410e1cc0bd0734eda9e2e31894f1895ad36e
Author: lshyu <lshyu@vivantech.com>
Date:   Tue Aug 12 14:32:36 2014 -0400

    [KFSQA-1011] more changes for review

commit cdda8cec683a6ccc31cfafdb6c8504bcb74b6f73
Author: lshyu <lshyu@vivantech.com>
Date:   Tue Aug 12 14:21:04 2014 -0400

    [KFSQA-1011] Changes based on review comments

commit c86cbfda3948eacf06e77402f65070e6521bf6b4
Author: lshyu <lshyu@vivantech.com>
Date:   Tue Aug 12 08:13:50 2014 -0400

    [KFSQA-1011] cleaned up

commit 770a044e705ccda0e85c60f6d48d5a67c0caf9ce
Author: lshyu <lshyu@vivantech.com>
Date:   Fri Aug 8 16:07:15 2014 -0400

    [KFSQA-1011] fixed invoice amount

commit e6843c15b5b5070ef20bf90d1e0c4bcac71ae505
Author: lshyu <lshyu@vivantech.com>
Date:   Fri Aug 8 14:11:39 2014 -0400

    [KFSQA-1011] initial commit for E2E eshop with sensitive commodity, capital asset, CG account, and high dollar amount.

commit 8e3726d8daf66b226983273b092fcdb285c4ae21
Author: Shawn Bower <shawn.bower@gmail.com>
Date:   Wed Aug 6 12:13:40 2014 -0400

    scenario was missing @nightly-jobs tag

commit 0ab4d2a3b317894ee8d850ee30ce33287f30d0df
Merge: 1984c7a 3206885
Author: lshyu <lshyu@vivantech.com>
Date:   Tue Aug 5 15:00:31 2014 -0400

    [KFSQA-1054] merged from master

commit 320688506e13614af496d22abcdf52b5d93e82bc
Merge: 230ce5d dd17167
Author: lshyu <lshyu@vivantech.com>
Date:   Tue Aug 5 12:40:08 2014 -0400

    [KFSQA-1049] merged from master

commit dd17167a30de5add82e261da2062c84323bb2587
Author: Kyle Oliveira <kyle.oliveira@cornell.edu>
Date:   Tue Aug 5 11:39:21 2014 -0400

    [KFSQA-856] Removed @wip in preparation for master merge.

commit abfa9a964ffad5f51afcf0fc9e1f164668f164a8
Merge: bb21534 15c2b8a
Author: Kyle Oliveira <kyle.oliveira@cornell.edu>
Date:   Tue Aug 5 11:16:21 2014 -0400

    Merge branch 'master' into KFSQA-856

commit 15c2b8a2a4287b88e5936ad86e7859a9f3f1c61a
Author: lshyu <lshyu@vivantech.com>
Date:   Tue Aug 5 09:55:35 2014 -0400

    [KFSQA-1039] replace 'I am logged in as a KFS User' with 'I am logged in as a KFS User for the DV document'

commit b410245af161aee6e7911f6ade5105402722d7ed
Author: Kyle Oliveira <kcoliveira@ucdavis.edu>
Date:   Tue Aug 5 09:43:19 2014 -0400

    Update .gitignore

    Added additional things to ignore that support Eclipse.

commit 230ce5da3307f92330a7a13e6bbe6a1450ce4657
Author: lshyu <lshyu@vivantech.com>
Date:   Mon Aug 4 16:05:05 2014 -0400

    [KFSQA-1049] replace hard coded data in GEC feature

commit 6f9e4813646157e9d2612ce1c2ffb9f124bfdcef
Author: Tony <tony@rsmart.com>
Date:   Mon Aug 4 12:11:39 2014 -0700

    wrong user for blanket approve on an account clone [KFSQA-649]

commit 1984c7afeaa8bce149ad666dae2628e9ee785664
Author: lshyu <lshyu@vivantech.com>
Date:   Mon Aug 4 13:48:35 2014 -0400

    [KFSQA-1054] convert one more scenario for this hard coded data replacement test.

commit d0c5477f5a7714f8089b513e629e2aa04eeb9275
Author: Tony <tony@rsmart.com>
Date:   Mon Aug 4 10:20:33 2014 -0700

    Fix for incorrext feature name [KFSQA-662]

commit 648fc3a06e4e3010173b579e04a08416fbd05da3
Author: lshyu <lshyu@vivantech.com>
Date:   Mon Aug 4 11:11:34 2014 -0400

    [KFSQA-1054] first try to replace hard coded vendor#,acct#,commodity,object code, item cost for REQS.

commit bb21534a9696c03f811fd5fb3c7f79d267845a66
Author: Kyle Oliveira <kyle.oliveira@cornell.edu>
Date:   Fri Aug 1 15:23:30 2014 -0400

    [KFSQA-856] Obvious fixes I found while setting up the review.

commit d3d9184140248c06ecff3b8880253c4cd9aafd84
Author: Kyle Oliveira <kyle.oliveira@cornell.edu>
Date:   Fri Aug 1 15:07:27 2014 -0400

    [KFSQA-856] Added methods and a step for clearing your e-SHOP cart.

commit 04a0b810559e2dff1ca04d9a13c6c4dbff45a9ab
Merge: 804d3ad c920634
Author: Kyle Oliveira <kyle.oliveira@cornell.edu>
Date:   Fri Aug 1 12:54:55 2014 -0400

    Merge branch 'master' into KFSQA-856

commit 804d3adc85acc19bcd3fe2db36a2d6bde7194908
Author: Kyle Oliveira <kyle.oliveira@cornell.edu>
Date:   Fri Aug 1 12:54:06 2014 -0400

    [KFSQA-856] Cleaned up some stuff and added an absorb method to PaymentRequestObject.

commit 429851bd5a3bfec415a64aa96dee4ec3d630b0bb
Author: Kyle Oliveira <kyle.oliveira@cornell.edu>
Date:   Fri Aug 1 11:26:02 2014 -0400

    [KFSQA-856] Works. Cleaned up some stuff.

commit c920634b1a3416e675592ac5dbf7431198e62aaa
Author: lshyu <lshyu@vivantech.com>
Date:   Fri Aug 1 08:34:01 2014 -0400

    [KFSQA-1044] replace hard coded asset#,object_code, and account#

commit f4291eb650935e47d1a251df848105cac812f529
Author: Kyle Oliveira <kyle.oliveira@cornell.edu>
Date:   Thu Jul 31 17:56:15 2014 -0400

    [KFSQA-856] I think I got it working!

commit 316b40f76a7f756ea1548e0dd32fe864e6671a71
Author: lshyu <lshyu@vivantech.com>
Date:   Thu Jul 31 13:37:29 2014 -0400

    [KFSQA-1036] remove hard coded chart code

commit 297a3f23b73edfc60ff4ffebcf82e6780fdf5486
Author: lshyu <lshyu@vivantech.com>
Date:   Thu Jul 31 11:50:55 2014 -0400

    [KFSQA-1025] " I am logged in as a KFS User for the REQS document" have issue if the user has never logged to e-shop before, then it will cause submit po xml error issue.  Decided to use a parameter.

commit 03e84ba5a056d3897d9db7d60fecbf9cd8d69544
Author: lshyu <lshyu@vivantech.com>
Date:   Thu Jul 31 10:28:35 2014 -0400

    [KFSQA-1025]
    replace an obsolete step:
        Given I login as a KFS user to create an REQS
      With :
        Given I am logged in as a KFS User for the REQS document

commit 5fcd4b762347627db215ba6ef5b50e436c001d96
Author: lshyu <lshyu@vivantech.com>
Date:   Thu Jul 31 09:05:01 2014 -0400

    [KFSQA-1036] change speed tag

commit 2ccfcb89156783ae480e111a1a083d978e09f6e5
Author: lshyu <lshyu@vivantech.com>
Date:   Thu Jul 31 08:49:15 2014 -0400

    [KFSQA-1036] fixed issues that results merging from master
     - the sub account must be 'CS' type
     - the scenario must have 'blanket approve' step
     - the 'adhoc' user must be a member of 'C&G Processor'

commit 4e434e750b69c790edf554d0565f166b91b5d78a
Author: Kyle Oliveira <kyle.oliveira@cornell.edu>
Date:   Wed Jul 30 17:37:23 2014 -0400

    [KFSQA-856] Fixed some issues with absorbing Items and their accounting lines.

commit 1820f7ae41ba3173c420c0184e6fe38fe2e1986d
Author: lshyu <lshyu@vivantech.com>
Date:   Wed Jul 30 16:25:22 2014 -0400

    [KFSQA-1036] merged from master

commit 32b8ff050b587034b36a2c497aafe700cae4139d
Merge: 75e9cd0 3deef93
Author: lshyu <lshyu@vivantech.com>
Date:   Wed Jul 30 16:22:46 2014 -0400

    [KFSQA-1036] merged from master

commit 3deef93a3346a55bed14fdee587f081f65e50cc1
Author: Tony <tony@rsmart.com>
Date:   Wed Jul 30 13:04:57 2014 -0700

    removed extra stepsand hard coded values [KFSQA-728]

commit 4dd25e9b6a302d88976a54524cc85739d83dd4d3
Author: Tony <tony@rsmart.com>
Date:   Wed Jul 30 12:54:42 2014 -0700

    removed uneeded lines and hard coding that had expired account [KFSQA-589]

commit 42bcdd4414725b4f94ed0f8582e839dc9c4f7995
Author: Tony <tony@rsmart.com>
Date:   Wed Jul 30 12:17:25 2014 -0700

    fixing issues with child vendors being used sometimes [KFSQA-1014]

commit 75e9cd0103af9a73ee3e87f9d749a0b191471df6
Author: lshyu <lshyu@vivantech.com>
Date:   Wed Jul 30 15:04:59 2014 -0400

    [KFSQA-1036] replace hard coded netids

commit 888b703e609086f9ace75e39aea6b33e86a69d1b
Author: Tony <tony@rsmart.com>
Date:   Wed Jul 30 11:45:23 2014 -0700

    removing wip [KFSQA-1060]

commit c390994017b1448632d8a35c3af7d9bcfa8900de
Merge: 5c6e666 b8ef29d
Author: Tony <tony@rsmart.com>
Date:   Wed Jul 30 11:05:03 2014 -0700

    Merge remote-tracking branch 'origin/master'

commit 5c6e66608dae535e287f78d2f1cc2a0950c64831
Author: Tony <tony@rsmart.com>
Date:   Wed Jul 30 11:04:44 2014 -0700

    fixed up some of the hard coded items again [KFSQA-1060]

commit b8ef29dc20bfcba12eda012687a8c08b477dcfb9
Author: lshyu <lshyu@vivantech.com>
Date:   Wed Jul 30 09:52:32 2014 -0400

    [KFSQA-1039] clean up

commit 8112311f0303e162edc2e83c0c92507f05731ded
Author: lshyu <lshyu@vivantech.com>
Date:   Wed Jul 30 08:09:31 2014 -0400

    [KFSQA-1039] clean up

commit 7b735932227f47a911046388c28c9b3ed141c066
Author: lshyu <lshyu@vivantech.com>
Date:   Wed Jul 30 07:44:35 2014 -0400

    [KFSQA-1039] lookup page check

commit eb6a11b7f570e4d7ac779a996d2c7385b071d0f4
Merge: cd5cca2 2930c51
Author: lshyu <lshyu@vivantech.com>
Date:   Wed Jul 30 07:41:09 2014 -0400

    [KFSQA-1039] merge from master

commit 2930c510f37302f5b99477f9747ff03a1e877e58
Author: lshyu <lshyu@vivantech.com>
Date:   Wed Jul 30 07:35:03 2014 -0400

    [KFSQA-1038] change hard coded type code

commit b70d468e3e2cde010c224c3cb9920c8ec93b60fc
Author: lshyu <lshyu@vivantech.com>
Date:   Wed Jul 30 07:29:43 2014 -0400

    [KFSQA-1038] remove duplicate blanket approver step

commit cd56e46eb3af96470b3ae64cbd7a53460852cc3d
Author: Tony <tony@rsmart.com>
Date:   Tue Jul 29 15:28:08 2014 -0700

    reverting one method due to problems [KFSQA-1060]

commit ed49543557b23d64bf31d473ff95451ae295637b
Author: Tony <tony@rsmart.com>
Date:   Tue Jul 29 14:38:33 2014 -0700

    found potential reason for false positives [KFSQA-1022]

commit e9f41a10cd9fba3419c7ac03d9f9ba19d1d8c7c7
Author: Kyle Oliveira <kyle.oliveira@cornell.edu>
Date:   Tue Jul 29 16:32:32 2014 -0400

    [KFSQA-856] Updated the Items mixin to handle Items for PREQ. Seems to work so far.

commit cd5cca2505c6c1df96dcf2d86433270f73aff194
Author: lshyu <lshyu@vivantech.com>
Date:   Tue Jul 29 16:20:26 2014 -0400

    [KFSQA-1039] just in case to terminate the loop after 10 tries

commit 7d1d243de8bfe21631ef4a9a79e34ec0f76710c4
Author: lshyu <lshyu@vivantech.com>
Date:   Tue Jul 29 15:02:51 2014 -0400

    [KFSQA-1039] revert last change

commit a5e6a7dc85d15c6ecc3c59d149bda6d5d2cf10da
Author: lshyu <lshyu@vivantech.com>
Date:   Tue Jul 29 15:00:37 2014 -0400

    [KFSQA-1039] trying to check update in oracle vm issue

commit 65fbacdc5371454bf8ba99293262085b71e29b08
Merge: cebe059 4fab754
Author: Tony <tony@rsmart.com>
Date:   Tue Jul 29 11:22:23 2014 -0700

    Merge branch 'master' into KFSQA-1060

    Conflicts:
    	features/step_definitions/login_to_KFS.rb

commit 9e50140a2244583afd039616bf8194c629900f7b
Author: lshyu <lshyu@vivantech.com>
Date:   Tue Jul 29 13:47:23 2014 -0400

    [KFSQA-1039] add a comment

commit 8389a1e2bc0c12b4b4279a23ba31a31506987eb9
Author: lshyu <lshyu@vivantech.com>
Date:   Tue Jul 29 12:38:18 2014 -0400

    [KFSQA-1039] remove a couple of steps from feature

commit 4fab7542cf2ecad65bf90b40f7d91af58d49bb13
Merge: 4db25c9 999910f
Author: lshyu <lshyu@vivantech.com>
Date:   Tue Jul 29 12:33:13 2014 -0400

    [KFSQA-1038] merge from master

commit a9513ef60f58b8b25d6ece6794f51beb8552af23
Author: lshyu <lshyu@vivantech.com>
Date:   Tue Jul 29 11:30:19 2014 -0400

    [KFSQA-1039] some more changes and fixes

commit 8b4bd8881de1a0f32c9db4b97fdf0b282b8c965d
Author: lshyu <lshyu@vivantech.com>
Date:   Tue Jul 29 09:39:06 2014 -0400

    [KFSQA-1039] replaced hard coded netid and fixed bugs

commit 999910f8ad05832780c83d009bf7b87bba263996
Merge: e015a7a 4576d75
Author: Tony <tony@rsmart.com>
Date:   Mon Jul 28 15:23:56 2014 -0700

    Merge branch 'master' into KFSQA-1014

    Conflicts:
    	features/step_definitions/routing.rb
    	features/vendor/vendor_edit.feature

commit e015a7adfd94a6c10a1098a9fb7040bc5944ca9c
Author: Tony <tony@rsmart.com>
Date:   Mon Jul 28 15:21:50 2014 -0700

    All is working! [KFSQA-1014]

commit 1da781c4b784e2e763761c5de98d74a9828e37ca
Merge: f8f89e1 4576d75
Author: Kyle Oliveira <kyle.oliveira@cornell.edu>
Date:   Fri Jul 25 13:59:15 2014 -0400

    Merge branch 'master' into KFSQA-856

    Conflicts:
    	features/step_definitions/purap/requisition_base.rb

commit f8f89e111eb240b9fa6365c21d27713ec2165a6e
Author: Kyle Oliveira <kyle.oliveira@cornell.edu>
Date:   Fri Jul 25 13:56:40 2014 -0400

    [KFSQA-856] More work.

commit 4db25c988a3e0ea0e5870b4de12f76ac1538ab55
Author: lshyu <lshyu@vivantech.com>
Date:   Fri Jul 25 13:08:21 2014 -0400

    [KFSQA-1038] replace hard coded netid and changed some steps after comparing google doc and feature file

commit cebe059ed2d8d460f3d1796cdbc7278a3274d516
Author: Tony <tony@rsmart.com>
Date:   Fri Jul 25 10:14:24 2014 -0400

    added document blanket approver method [KFSQA-1060]

commit 4576d75f93494d8166de1ee5f11449e4e2f7106b
Author: lshyu <lshyu@vivantech.com>
Date:   Fri Jul 25 07:44:45 2014 -0400

    [KFSQA-1040] replace hard coded netid

commit bfcdbbd3956b433d6f113c000aa8cca5136f71f7
Author: lshyu <lshyu@vivantech.com>
Date:   Thu Jul 24 15:20:28 2014 -0400

    [KFSQA-1037] remove a couple todo lines

commit d05bb5b3daecc5a88d8b5830af9370e8417da4f5
Author: lshyu <lshyu@vivantech.com>
Date:   Thu Jul 24 14:57:48 2014 -0400

    [KFSQA-1037] replaced hard coded netids

commit a49452f329c2ad3b7dfff936801b9fcae0b25628
Author: Tony <tony@rsmart.com>
Date:   Thu Jul 24 14:45:59 2014 -0400

    removing more hard coding during login process [KFSQA-1060]

commit 936ade54bd0dee0de0877a6b21f0c1424a05ca69
Author: Kyle Oliveira <kyle.oliveira@cornell.edu>
Date:   Thu Jul 24 12:55:12 2014 -0400

    [KFSQA-856] Work so far.

commit 256f0f2a754b6ad5114a40adbb02aeefcea7a64a
Author: lshyu <lshyu@vivantech.com>
Date:   Thu Jul 24 10:49:14 2014 -0400

    [KFSQA-1055] replaced an expired account with active one

commit 501bbe00631ebd005f90df5417035e206e97a698
Merge: f05337f ee827eb
Author: lshyu <lshyu@vivantech.com>
Date:   Thu Jul 24 06:52:38 2014 -0400

    [KFSQA-1043] merge from master

commit ee827eb921d4ac9c917bddf1487919a03554ea54
Author: Shawn Bower <shawn.bower@gmail.com>
Date:   Wed Jul 23 19:43:25 2014 -0400

    removing wip

commit 0e3dd5218556e95c7b45563229ac09e6d79f4afe
Author: Tony <tony@rsmart.com>
Date:   Wed Jul 23 18:49:59 2014 -0400

    Typo on final then statement [KFSQA-1014]

commit 1511a13028c6801d65d4409ba6211b4b196abe83
Author: Tony <tony@rsmart.com>
Date:   Wed Jul 23 18:46:23 2014 -0400

    smoke test working [KFSQA-1014]

commit 915046194ec1aa5f04242e81eb98420ce0460311
Author: Tony <tony@rsmart.com>
Date:   Wed Jul 23 18:43:16 2014 -0400

    smoke test working [KFSQA-1014]

commit 8c7b5e5e7e18bc6918aec62d2f532867465b035c
Merge: a8104e6 ef899bb
Author: Tony <tony@rsmart.com>
Date:   Wed Jul 23 15:21:47 2014 -0400

    Merge branch 'master' into KFSQA-1014

commit a8104e64767eb9b07fc59153f39f85b5a371caf9
Author: Tony <tony@rsmart.com>
Date:   Wed Jul 23 15:20:26 2014 -0400

    vendor edit working [KFSQA-1014]

commit d0458a922cb8999891be33fca449d46f0d864a6c
Author: Tony <tony@rsmart.com>
Date:   Wed Jul 23 15:07:50 2014 -0400

    initial work [KFSQA-1060]]

commit f05337fdc13972b4be9bc0fcb1c42bdd7b9ee289
Author: lshyu <lshyu@vivantech.com>
Date:   Wed Jul 23 15:06:12 2014 -0400

    [KFSQA-1043] replaced hard coded netids
    fixed hard coded object in steps that are shared
    fixed vendorname is empty when it is using lastname/fistname

commit ef899bb856c6c5901977bb981fcf28d906eee7c5
Author: Tony <tony@rsmart.com>
Date:   Wed Jul 23 10:33:17 2014 -0400

    misnamed step [KFSQA-1056]

commit 110a5cf2b25565d4d08b81486fb468c1b2674d70
Merge: c36a7f2 536005f
Author: Tony <tony@rsmart.com>
Date:   Tue Jul 22 16:22:26 2014 -0400

    Merge remote-tracking branch 'origin/master'

commit c36a7f20f8a5050127ea375acc3dab7343aa0772
Author: Tony <tony@rsmart.com>
Date:   Tue Jul 22 16:22:18 2014 -0400

    Wasn't checking for the right error [KFSQA-1061]

commit e19ae2afc4d3099a36a70a075bafd3dcd706d254
Author: Tony <tony@rsmart.com>
Date:   Tue Jul 22 15:50:16 2014 -0400

    fixing a bug by replacing code with web service call [KFSQA-1014]

commit 536005f802a6a209b663302a39ef31bb267359a9
Merge: 7194869 57eaf63
Author: lshyu <lshyu@vivantech.com>
Date:   Tue Jul 22 14:15:53 2014 -0400

    Merge branch 'master' of https://github.com/CU-CommunityApps/kuality-kfs-cu

commit 719486939d077f8c591110920f6b99c0d0c53e9f
Author: lshyu <lshyu@vivantech.com>
Date:   Tue Jul 22 14:14:57 2014 -0400

    [KFSQA-1052] add @smoke tag

commit 6d7156b668d98090f0bcd8088375943712ef3702
Merge: ae70922 57eaf63
Author: Tony <tony@rsmart.com>
Date:   Tue Jul 22 13:38:00 2014 -0400

    Merge branch 'master' into KFSQA-1014

commit 57eaf63fafed30f3789ec5084ef00f273b7cef9d
Merge: 210bd32 737d1da
Author: Tony <tony@rsmart.com>
Date:   Tue Jul 22 13:11:05 2014 -0400

    Merge remote-tracking branch 'origin/master'

commit 210bd320ab57d5c80cf2069cdb8d272d16d0b517
Author: Tony <tony@rsmart.com>
Date:   Tue Jul 22 13:10:54 2014 -0400

    tests were running too slowly causing it to try to run while it was still running [KFSQA-1050]

commit 737d1daf55f72adb5e00209eb88f1fefc21e96df
Merge: d41add3 5487018
Author: lshyu <lshyu@vivantech.com>
Date:   Tue Jul 22 12:39:54 2014 -0400

    [KFSQA-1042] merged from master

commit d41add35c622dd991d033b8bf7d8163cb64871da
Author: lshyu <lshyu@vivantech.com>
Date:   Mon Jul 21 15:04:10 2014 -0400

    [KFSQA-1042]  replaced hard coded netid and contract manager number for other PURAP features

commit 54870187683af83ccc036f4f978b930ecce8c24e
Author: Shawn Bower <shawn.bower@gmail.com>
Date:   Mon Jul 21 08:13:41 2014 -0400

    Update utilities.feature

commit cfd541fead6eae8dad496c018f0d5e559b94d543
Author: lshyu <lshyu@vivantech.com>
Date:   Fri Jul 18 12:01:18 2014 -0400

    [KFSQA-1042]  replaced hard coded netid and contract manager number

commit 8a0d5d866796e8c66baa56503b0c179874eec9ec
Author: lshyu <lshyu@vivantech.com>
Date:   Fri Jul 18 07:39:30 2014 -0400

    [KFSQA-1041]  merged to master
    replaced hard coded netid 'db18'
    Replaced closed account with active one.
    replaced "I login as a KFS user to create an REQS" with " I am logged in as an e-SHOP User"

commit 10ff17e085918923b5ce56a9cbb43a1e2a6839cf
Author: Shawn Bower <shawn.bower@gmail.com>
Date:   Thu Jul 17 19:12:02 2014 -0400

    removing wip

commit 9501cff2c7b16b62a4d4ab4857f681e2af01c1c6
Author: Tony <tony@rsmart.com>
Date:   Thu Jul 17 14:18:28 2014 -0700

    added to @smoke tag per Kris [KFSQA-1015]

commit 8675ed8d4747954e5ec687f6989ceebc6e206319
Author: Tony <tony@rsmart.com>
Date:   Thu Jul 17 14:17:09 2014 -0700

    Someone refactored a step definition and didnt change all usages  [KFSQA-1019]

commit 7cc855d3c81238e0ffd1d3e421d2f8fcaeb4c6e3
Merge: ead0b30 add92ce
Author: Tony <tony@rsmart.com>
Date:   Wed Jul 16 15:45:01 2014 -0700

    Merge remote-tracking branch 'origin/master'

commit ead0b3097aaf8eabde6e5979a53f333ad2fb1556
Author: Tony <tony@rsmart.com>
Date:   Wed Jul 16 15:44:50 2014 -0700

    removing old code that was copied from KC project but never really used [KFSQA-1024]

commit add92ce5443f5de1d56e32e2b0b4bcd640cf6141
Author: Todd Plesniak <tplesniak@rsmart.com>
Date:   Wed Jul 16 16:42:48 2014 -0400

    bug fix for level arguments

commit 26e9d750324705fe573bd808247b90669895d6d3
Merge: 4f7d363 a3c0fb4
Author: Tony <tony@rsmart.com>
Date:   Wed Jul 16 13:30:44 2014 -0700

    Merge branch 'master' of https://github.com/CU-CommunityApps/kuality-kfs-cu

commit 4f7d36333d28897cdb99b90e2f07a9600624fbc0
Author: Tony <tony@rsmart.com>
Date:   Wed Jul 16 13:30:14 2014 -0700

    fixing a bug by replacing code with web service call [KFSQA-1014]

commit a3c0fb4987d2d0bac5f7ae1682e732f818a69180
Author: lshyu <lshyu@vivantech.com>
Date:   Wed Jul 16 15:23:22 2014 -0400

    [KFSQA-1057]  Replaced closed account with active account

commit 0854a643815ed8a432d7e0a428d95055a1f56a3e
Author: lshyu <lshyu@vivantech.com>
Date:   Wed Jul 16 15:21:06 2014 -0400

    [KFSQA-1059]  merged to master.  not using hard coded account which is expired

commit ae709227ed315aceaf294f7817874a5ffab45376
Author: Tony <tony@rsmart.com>
Date:   Wed Jul 16 09:32:37 2014 -0700

    fixing a bug by replacing code with web service call [KFSQA-1014]

commit 8e1333fd532a038896589efa050fc311979bf32d
Merge: 4a32026 ff0c4ff
Author: Tony <tony@rsmart.com>
Date:   Wed Jul 16 08:32:13 2014 -0700

    Merge branch 'master' into KFSQA-1014

commit 28ee25206e9d34d48182d7816cb0a453dd2e4dc2
Author: Kyle Oliveira <kyle.oliveira@cornell.edu>
Date:   Tue Jul 15 14:58:48 2014 -0400

    [KFSQA-856] Having issues with SciQuest, but we are getting closer to working...

commit ff0c4ff068adfe26645f59d28ac3910021b73153
Author: Shawn Bower <shawn.bower@gmail.com>
Date:   Tue Jul 15 09:22:18 2014 -0400

    Disbursement Method Reviewer changed namespaces in 5.2, updating login script to match

commit e1e063952bf485939c30897fd902e8baf3e3b941
Merge: 445f2c9 d7f8410
Author: Kyle Oliveira <kyle.oliveira@cornell.edu>
Date:   Mon Jul 14 16:52:33 2014 -0400

    Merge branch 'master' into KFSQA-856

    Conflicts:
    	features/step_definitions/purap/requisition_500_to_25000.rb

commit 445f2c985ff499a297355b8b82eabdd7dd39ad4e
Author: Kyle Oliveira <kyle.oliveira@cornell.edu>
Date:   Mon Jul 14 16:44:22 2014 -0400

    [KFSQA-856] Figured out the issue with getting a particular account number.

commit d7f84107c16728079cea26444d61b6f859b81d77
Merge: 28daf4f 5285f4e
Author: Tony <tony@rsmart.com>
Date:   Mon Jul 14 13:25:10 2014 -0700

    Merge remote-tracking branch 'origin/master'

commit 28daf4f3cb2eda09630b0437bfde966d31e689d2
Author: Tony <tony@rsmart.com>
Date:   Mon Jul 14 13:25:02 2014 -0700

    stupid copy/paste problem [KFSQA-1018]

commit 5285f4e340a42dcfe8a790e90ccf284bc15de6fd
Author: Todd Plesniak <tplesniak@rsmart.com>
Date:   Mon Jul 14 15:35:58 2014 -0400

    Removing Wips before someone sees them

commit b991ff53ca83c3186dc6a9c946d5e5808c9f33d8
Merge: cad5c3b 04c743d
Author: Tony <tony@rsmart.com>
Date:   Mon Jul 14 12:30:16 2014 -0700

    Merge remote-tracking branch 'origin/master'

commit cad5c3be5841d4738df2286c89ad0c7430882cba
Author: Tony <tony@rsmart.com>
Date:   Mon Jul 14 12:28:40 2014 -0700

    missing default value for default payment method field on vendor [KFSQA-1019]

commit 04c743d1cd2a2ff86483da93a67a252add5315d8
Merge: 9cf87b0 cd3a01f
Author: Todd Plesniak <tplesniak@rsmart.com>
Date:   Mon Jul 14 14:34:27 2014 -0400

    Merge branch 'master' of https://github.com/CU-CommunityApps/kuality-kfs-cu

commit 9cf87b02b1bf3cdd318660b386865be43e924ce1
Author: Todd Plesniak <tplesniak@rsmart.com>
Date:   Mon Jul 14 14:34:24 2014 -0400

    KFSQA-864 merging master into branch

commit 060ddd80ba28844cdd3cbb2be0dc91b498896c39
Author: Todd Plesniak <tplesniak@rsmart.com>
Date:   Mon Jul 14 13:47:55 2014 -0400

    KGSQA-864 more code review changes

commit ed25c8c2d922ba0a66b2a98d7e73b7444fae8429
Author: Kyle Oliveira <kyle.oliveira@cornell.edu>
Date:   Mon Jul 14 09:22:12 2014 -0400

    [KFSQA-856] Got some revisions, yo.

commit 7dfb409ee3405b2ca991977b761bffb3261b2a63
Author: Todd Plesniak <tplesniak@rsmart.com>
Date:   Sun Jul 13 21:29:46 2014 -0700

    KFSQA-864 code review changes

commit cd3a01fa4823a213d9cc479b8b10f7cb940bbd0c
Author: Tony <tony@rsmart.com>
Date:   Thu Jul 10 16:05:10 2014 -0400

    fixed a problem with notes as well as defaultB2BPaymentMethodCode was marked as a text field instead of a select [KFSQA-1019]

commit 85d7b5e3ad7b0c098e01e4e83f6cd330fd5f0d11
Author: Todd Plesniak <tplesniak@rsmart.com>
Date:   Thu Jul 10 12:59:22 2014 -0700

    KFSQA-864 removed debug for code review

commit 4a3202632183d7fb201f21e8fd4d9a02365a18ca
Author: Tony <tony@rsmart.com>
Date:   Thu Jul 10 14:44:57 2014 -0400

    fixing a bug by replacing code with web service call [KFSQA-1014]

commit a1ef5c9fcd42a061fcbcf8668ee368f0240b778f
Merge: 3352c4c 67a8209
Author: Todd Plesniak <tplesniak@rsmart.com>
Date:   Thu Jul 10 11:44:50 2014 -0700

    KFSQA-864 merging master into branch

commit 88ed207856131f67e66a01122f35073607f9edb1
Merge: 821d09c 39f6548
Author: Tony <tony@rsmart.com>
Date:   Thu Jul 10 14:42:46 2014 -0400

    Merge branch 'master' into KFSQA-1014

    Conflicts:
    	features/step_definitions/vendor/vendor.rb

commit 39f6548254e2776556cd0c89a643d2774b7955a6
Author: Tony <tony@rsmart.com>
Date:   Thu Jul 10 14:16:09 2014 -0400

    Added code to do a more meaningful check so it doesnt always succeed. also added role lookups instead of hard coded users [KFSQA-1020]

commit 67a8209ca748f5da8158face84dce2a4dffaed59
Author: Tony <tony@rsmart.com>
Date:   Thu Jul 10 12:59:07 2014 -0400

    fixed a problem with fiscal year being set to actual year instead of currnt fiscal year [KFSQA-1018]

commit 3352c4c010dfed8be69cd24b6220b0e806daf35a
Merge: 3dff6f2 b9a34d7
Author: Todd Plesniak <tplesniak@rsmart.com>
Date:   Thu Jul 10 09:34:21 2014 -0700

    KFSQA-864 merged master into branch

commit 07434829d9f30182d166de49e69f1dbf0fbc344f
Author: Tony <tony@rsmart.com>
Date:   Thu Jul 10 12:32:49 2014 -0400

    fixed a bug in routing. removed hard coding [KFSQA-1017]

commit 3dff6f2c9de9353fbb45141c067422efa83ff82a
Author: Todd Plesniak <tplesniak@rsmart.com>
Date:   Thu Jul 10 09:28:35 2014 -0700

    KFSQA-864 removing debug puts statements

commit b9a34d7fef0b21341455e01726c8e62f8ab7d4fb
Author: Tony <tony@rsmart.com>
Date:   Thu Jul 10 12:28:16 2014 -0400

    fixed a bug in routing. removed hard coding [KFSQA-1016]

commit 641724892bee8206e3a832104b27e91448085dae
Author: Todd Plesniak <tplesniak@rsmart.com>
Date:   Thu Jul 10 09:23:15 2014 -0700

    KFSQA-864 clean up to prepare a merge with master

commit 2433a934f636cc78395960b76fe3fe803b3b89e4
Author: Tony <tony@rsmart.com>
Date:   Thu Jul 10 11:14:08 2014 -0400

    fixing a bug and adding notes and new methods for getting accounts [KFSQA-1015]

commit e934f2d6bf1e452a7982ad76cc7da82a7a3596d5
Author: Kyle Oliveira <kyle.oliveira@cornell.edu>
Date:   Wed Jul 9 14:06:36 2014 -0400

    [KFSQA-856] Cleaning up some stuff.

commit 821d09c20aa932b1a4c84d29405d2e41eaef716d
Author: Tony <tony@rsmart.com>
Date:   Wed Jul 9 12:00:28 2014 -0400

    fixing a bug by replacing code with web service call [KFSQA-1014]

commit d9e2c6120cfa3da58eb95fef81504f896905dbbe
Author: Kyle Oliveira <kyle.oliveira@cornell.edu>
Date:   Wed Jul 9 10:26:12 2014 -0400

    [KFSQA-856] Merged in most recent changes to master and added a @wip tag.

commit b6f54fea9b7c30f89562113bfc47fccd43a314e2
Merge: decef35 3c8095b
Author: Kyle Oliveira <kyle.oliveira@cornell.edu>
Date:   Wed Jul 9 10:25:18 2014 -0400

    Merge branch 'master' into KFSQA-856

    Conflicts:
    	features/purap/eshop_create.feature

commit decef35395732db018744eca406a8f5eedea0b33
Author: Kyle Oliveira <kyle.oliveira@cornell.edu>
Date:   Wed Jul 9 09:59:10 2014 -0400

    [KFSQA-856] Proposed changes to initial submission.

commit 2623fa4122849eeb5b0790be7477de6a2950c904
Author: Kyle Oliveira <kyle.oliveira@cornell.edu>
Date:   Wed Jul 9 09:56:34 2014 -0400

    [KFSQA-856] Initial commit based on JIRA submission.

commit ab4aaf0d10bdc228608282fc5b46a4339e17edbe
Author: Tony <tony@rsmart.com>
Date:   Wed Jul 9 09:41:09 2014 -0400

    fixing a bug by replacing code with web service call [KFSQA-1013]

commit 289b046673417ad2aad8615ecd2694ea103c63e2
Author: Todd Plesniak <tplesniak@rsmart.com>
Date:   Tue Jul 8 12:04:36 2014 -0700

    KFSQA-864 removed merge artifact

commit c447054fba400112f3a4c09806d2b710251ae5c3
Merge: b1443f7 1bc1911
Author: Todd Plesniak <tplesniak@rsmart.com>
Date:   Mon Jul 7 13:26:57 2014 -0700

    KFSQA-864 - merging master into branch

commit b1443f75fcd3b94044d79d7189db9a7c3748e4ec
Author: Todd Plesniak <tplesniak@rsmart.com>
Date:   Fri Jun 27 18:07:39 2014 -0700

    KFSQA-864 stashing changes to do code review

commit 4468ec47a62d39cfff69e67de862532f1d042a74
Author: Todd Plesniak <tplesniak@rsmart.com>
Date:   Wed Jun 25 17:42:17 2014 -0700

    KFSQA-864 clean up and test finally working, just need validation

commit 389084fe700a592106b33319620342b3aa5eb99b
Author: Todd Plesniak <tplesniak@rsmart.com>
Date:   Wed Jun 25 10:35:00 2014 -0700

    KFSQA-864 test still not working but much closer
[KFSQA-970] Added steps to save ST and verify LLPE values before submission.  Replaced hardcode input data with Parameter defined data.  [KFSQA-1012] Replaced hardcoded input data with Parameter defined data.