Added another step definition for F&A when linking a second proposal to an Award with "no change"
Added another step definition for F&A when linking a second proposal to an Award with "no change"
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	features/step_definitions/awards/award_view.rb
Some minor code clean-up.
Merge branch 'development' of github.com:aheward/kuality-coeus into development

* 'development' of github.com:aheward/kuality-coeus:
  Some minor code clean-up.
  Added another step definition for F&A when linking a second proposal to an Award with "no change"
  Added another step definition for F&A when linking a second proposal to an Award with "no change"
Squashed commit of the following:

commit f4a6a4ba562ce1bf4c8e97074f62111f2d569bbb
Merge: d44233c fb4a148
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Thu Feb 13 10:34:22 2014 -0700

    Merge branch 'development' of github.com:aheward/kuality-coeus into development

    * 'development' of github.com:aheward/kuality-coeus:
      Some minor code clean-up.
      Added another step definition for F&A when linking a second proposal to an Award with "no change"
      Added another step definition for F&A when linking a second proposal to an Award with "no change"

commit d44233cbdc3113a11b9054b706009a596d61246e
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Thu Feb 13 10:19:10 2014 -0700

    Removed two unnecesary, duplicate steps.

commit aafeba248493e5e21d85314db79b161eeb2b9cc4
Merge: 006ef41 c4c5777
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Wed Feb 12 14:30:58 2014 -0700

    Merge branch 'development' of github.com:aheward/kuality-coeus into development

    * 'development' of github.com:aheward/kuality-coeus:
      All changes relate to the addition of tests for Unrecovered F&A in Awards. Note that these updates will require using a new version of the TestFactory.

commit 006ef414ffb14aa20c3b3b13a4523c03a4f0cd64
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Tue Feb 11 10:56:03 2014 -0700

    Minor Edits: Testing s2s Scripts

commit 2ac4a67a59462e2bcc6b41ce1f3cf68c142a2e84
Merge: 4f2e33f 13e5eed
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Mon Feb 10 13:22:22 2014 -0700

    Merge branch 'development' of github.com:aheward/kuality-coeus into development

    * 'development' of github.com:aheward/kuality-coeus:
      Creation of a new step definition for validating/setting a parameter's value.
      Added unrecovered F&A to the set of things included in the institutional proposals.
      Now can successfully add unrecovered f&a data objects to a Budget version.

commit 4f2e33f506a653016fa4a539702093137b8b2640
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Mon Feb 10 11:52:01 2014 -0700

    New Step Def: Adding funding proposal for 'initial funding'

    This is a step def that [specifically] adds funding proposal to an Award for its 'Initial Funding'.

commit 2f245271b600af8a7ed3b9561250a742db47b432
Merge: 44292c4 ab6b7d2
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Fri Feb 7 10:13:00 2014 -0700

    Merge branch 'development' of github.com:aheward/kuality-coeus into development

    * 'development' of github.com:aheward/kuality-coeus:
      Beginning the code for the Budget's Unrecovered F&A data object and related page elements.
      New scenario added: adding funding proposal to award feature.

commit 44292c400095ca2296e8b1c196c6d5fb6ec932f5
Merge: b9825ce 12e83a9
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Wed Feb 5 08:52:07 2014 -0700

    Merge branch 'development' of github.com:aheward/kuality-coeus into development

    * 'development' of github.com:aheward/kuality-coeus:
      Completion of Adding Funding Proposals to Award, with related code tested and complete.
      Completion of Adding Funding Proposals to Award, with related code tested and complete.
      Added new step def and supporting code for checking an Award's cost share data against the added IPs.
      Last A/FP scenario validated. Now going to start working on code to include tests for cost share and special review.

commit b9825cefae4aba4d4b91c99f2e47486fcbd664a1
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Wed Feb 5 08:51:53 2014 -0700

    Debugging why the cost share amount in the 'inheritting' step do not get shared.

commit 8eae3770f8307a8bc3a1ce792f9868e4ec8b00dd
Merge: c8db6bd 0b8f5d8
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Fri Jan 31 10:27:12 2014 -0700

    Merge branch 'development' of github.com:aheward/kuality-coeus into development

    * 'development' of github.com:aheward/kuality-coeus:
      Another couple A/FP scenarios written and validated.
      More fixes to Award/FP scenarios.

commit c8db6bdfb65e8373d266b490888a772e8db9071c
Merge: f5ca906 d5d13f9
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Thu Jan 30 16:04:59 2014 -0700

    Merge branch 'development' of github.com:aheward/kuality-coeus into development

    * 'development' of github.com:aheward/kuality-coeus:
      Added a couple more scenarios for Awards, fixing a step so expectations would be met.
      Fixed waiting code in the submit to sponsor button.
      More refinements to waiting for the interim page to go away.

commit f5ca90652bbfc6ab3c02dd14425c05a0422d5ff5
Merge: 62f7d35 5b9c859
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Thu Jan 30 15:10:02 2014 -0700

    Merge branch 'development' of github.com:aheward/kuality-coeus into development

    * 'development' of github.com:aheward/kuality-coeus:
      Fix to approve button click and visit Research causing javascript interrupt error.

commit 62f7d352180ee62861a4fb50d44bd84a6556b078
Merge: 009861b 21761fe
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Thu Jan 30 14:26:40 2014 -0700

    Merge branch 'development' of github.com:aheward/kuality-coeus into development

    * 'development' of github.com:aheward/kuality-coeus:
      fix to users so that creation doesn't fail when the admin user isn't the current user.

commit 009861bafa23bbf848d3da54816c6c27b0a80e4c
Merge: 11c8a96 c4bf7f1
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Thu Jan 30 13:51:19 2014 -0700

    Merge branch 'development' of github.com:aheward/kuality-coeus into development

    * 'development' of github.com:aheward/kuality-coeus:
      Fix to problem with roles that don't need qualifiers.

commit 11c8a9610989b5b49ca7e60632bf3f6506df87c5
Merge: 993f0fb 7b1c412
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Thu Jan 30 13:25:03 2014 -0700

    Merge branch 'development' of github.com:aheward/kuality-coeus into development

    * 'development' of github.com:aheward/kuality-coeus:
      Back to 5.1.1 stuff, for now...

commit 993f0fb69996bae2b7f5f60d0de5d20f993a526f
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Thu Jan 30 09:17:25 2014 -0700

    Converted 'OSP Approver' user to 'OSPApprover'.

commit 799c250611e2a8da128c994b55523ae9d12f48c3
Merge: e05726b 63dc9aa
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Thu Jan 30 09:00:47 2014 -0700

    Merge branch 'development' of github.com:aheward/kuality-coeus into development

    * 'development' of github.com:aheward/kuality-coeus:
      Working on scenarios for adding multiple funding proposals.

commit e05726b93180888a8c3b392363a1b7a6f20e7efd
Merge: 5efe4ac d07d5ef
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Thu Jan 30 08:54:46 2014 -0700

    Merge branch 'development' of github.com:aheward/kuality-coeus into development

    * 'development' of github.com:aheward/kuality-coeus:
      Scenarios added for Funding Proposals and Awards.  More needed in order to get them all working, as yet.

commit 5efe4ac8b9a4c105b8b0177412fdd7f7d291fc84
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Wed Jan 29 16:02:21 2014 -0700

    Trying out additional opportunity codes for the s2s submission test

commit 750b57d7f3f214cffff6c01f9c2102087c7e3f32
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Wed Jan 29 14:11:55 2014 -0700

    Added the necessary background users to the ip_link_to_award feature file

commit d55b6a4b5d4d319e25970c3445e949a924462583
Merge: 8509018 e270380
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Wed Jan 29 13:33:14 2014 -0700

    Merge branch 'development' of github.com:aheward/kuality-coeus into development

    * 'development' of github.com:aheward/kuality-coeus:
      First 5.2 page object update, to the Login page...

commit 850901841a1f771966034ce657406220a9598080
Merge: 7b83cfa 83817cc
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Wed Jan 29 13:32:29 2014 -0700

    Merge with Abeheward and an additional change.

commit 7b83cfaff2dd34e47db5f6300860a15ab80a8c47
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Wed Jan 29 10:35:14 2014 -0700

    test commit

commit 9d25ea63893988a29cff57501a232bca4b6dd28a
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Tue Jan 28 10:55:02 2014 -0700

    Changes to the Institutional Porposal creation workflow

commit 2733db9e59ef79c99f313beecafda2b13e347101
Merge: 33d4955 8e7edec
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Mon Jan 27 11:28:28 2014 -0700

    Merge branch 'development' of github.com:aheward/kuality-coeus into development

    * 'development' of github.com:aheward/kuality-coeus:
      Small tweaks. Probably going to lead to merge difficulties.
      Small tweaks. Probably going to lead to merge difficulties.
      Fix to the KC-TS-1146 test scenario.
      Latest merges from Utter's development branch.
      Working on bad wording in step defs/features
      Merged Utter's latest dev branch
      Fix to "Attempt to create a Funding Proposal document w/o a required field' scenario.
      corrections to my attempted PR.
      Conflicts: 	features/post_award/kc_award/award_action_request.feature 	features/step_definitions/proposal_development/proposal_create.rb
      Fixed issues with the missing fields in Award test.
      Working through some issues with testing for required fields in Award.
      Fixed Award Contacts Lead Unit code. This may break Proposal Development Key Personnel.
      Added logic that will prevent the random selection of members of $users. Prevents issues when the PI is inadvertently the same as one of the workflow users.
      Removal of useless features. Removal of @failing tag from a couple scenarios. Added some nokogiri methods for large select lists.

    Conflicts:
    	features/grants_gov/s2s_submission.feature
    	features/post_award/institutional_proposal/IP_link_to_award.feature
    	features/post_award/kc_award/award_basic_validations.feature
    	features/proposal_development/proposal_workflow.feature
    	features/step_definitions/awards/award_fund.rb
    	features/step_definitions/proposal_development/proposal_create.rb
    	features/step_definitions/proposal_development/proposal_workflow.rb

commit 33d4955890521f943673f8da82daf3fbd93c61a7
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Mon Jan 27 11:19:54 2014 -0700

    Changes to the temporary IP search when the IP was created from a Proposal Log.

commit a3b818774e33567180a7023528ec44fa6aa49447
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Fri Jan 24 14:59:58 2014 -0700

    Rewrote the step def to produce a funding Proposal.

commit ad69b01f60fca1550aebda4d2923672d35c2c6e0
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Wed Jan 22 11:34:22 2014 -0700

    Changes to the vebage of several steps defs, mostly those having to do with the creation of proposals

commit fa52a5e1d668cf2d8525ca63658f7475261b5aae
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Tue Jan 21 11:44:27 2014 -0700

    Fixing proposal log workflow stepdefs.

commit 4b562a82328d853ef81fb9787eda5d993e7778b8
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Tue Jan 21 08:46:30 2014 -0700

    Conflicts:
    	features/post_award/kc_award/award_action_request.feature
    	features/post_award/kc_award/award_basic_validations.feature
    	features/post_award/kc_award/award_copy.feature
    	features/step_definitions/awards/award_create.rb

commit fc0b5e32aad850284f2c76879d489da9cbe7e6ef
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Tue Jan 21 08:39:43 2014 -0700

    changing the verbage around for several stepdefs.

commit 2ce30d0cb49d61e71db435d6fff311a5f16632bf
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Mon Jan 20 12:53:25 2014 -0700

    A few additional changes to get Awards created successfully, as well as proposal workflows 'working'.

commit 71c0b100463c460b4d4628433262164670ae880d
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Mon Jan 20 12:29:09 2014 -0700

    Stepdef for Submitting a Proposal to Sponsor previously called for the 'Unassigned' user to be added as a PI, but now it's just any PI.

commit a2b2c7504e5b0cbfa051f8e0e100cdb00e3e1ac6
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Fri Jan 17 10:34:10 2014 -0700

    I've got the workflow set in place for a grants.gov submission, but there's still a validation error to be corrected.

commit f825c9cce1c32b47d5d241cbcaf13f6c770e2362
Merge: 52919a7 c45e2c3
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Thu Jan 16 09:02:49 2014 -0700

    Merge branch 'development' of github.com:aheward/kuality-coeus into development

    * 'development' of github.com:aheward/kuality-coeus:
      Final fixes for navigation.
      Converted the #errors code to use nokogiri.

commit 52919a7b677d3396824500f0d257d8f4938e16c5
Merge: ca49fa7 b7b8502
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Thu Jan 16 08:37:08 2014 -0700

    Merge branch 'development' of github.com:aheward/kuality-coeus into development

    * 'development' of github.com:aheward/kuality-coeus:
      Fix to navigation code.  May still be problem areas, though.
      merged the temp navigation code
      Nokogiri test, and merge of Utter's dev branch.
      Refactored the #frm method. Seems to still be working fine.
      Now using nokogiri in a couple places, to help speed things up a bit.
      Removed a redundant step def.
      Removed a redundant step def.

    Conflicts:
    	features/post_award/kc_award/award_action_request.feature
    	features/proposal_development/proposal_workflow.feature
    	features/step_definitions/awards/award_fund.rb
    	features/step_definitions/proposal_development/proposal_create.rb
    	features/step_definitions/proposal_development/proposal_workflow.rb
    	lib/kuality-coeus/data_objects/user/users.yml

commit ca49fa7a5b826685f8c04a5b6455c9562d6f780a
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Thu Jan 16 07:59:23 2014 -0700

    Minor changes to the step definitions for submitting a proposal to its Sponsor.

commit 7b8fb7252a33f39c661cdbe057a1537e7bac90b7
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Tue Jan 14 14:30:12 2014 -0700

    Code clean-up/reorganization to complete award related tasks without so many steps written out.

commit 1576f568f29c4fc922e7db64f8d2a486f2eb3027
Merge: 3fef0f2 63e71a8
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Fri Jan 10 09:13:40 2014 -0700

    Merge branch 'development' of github.com:aheward/kuality-coeus into development

    * 'development' of github.com:aheward/kuality-coeus:
      Removal of the $admin user object. Turned out this was a bad idea.
      Creation of the $admin master user object.
      Creation of the $admin master user object.
      Simple code style cleanup
      Moved the base_url definition to Kuality. This makes the demarcation between Kuality and Cucumber more logical.
      Got rid of the saucelabs code. Cleaned up the env.rb file a little bit more.
      I moved the instantiation of $users to the Kuality class. Seems more logical for it to be there.
      Moved the definition of the save button to the base page since it's the same everywhere.
      Rename Award_copy.rb to award_copy.rb
      Improved some regex for getting names for key persons. The old way would've failed with names that contained spaces.
      Removal of some bad code. Put in some notes about how to fix issues, along with reminders that things are broken.
      Fix to a Proposal Log creation scenario.

commit 3fef0f2a3646838181e82b32cbe8c6a4e9d4b2e3
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Fri Jan 10 09:13:21 2014 -0700

    We figured out the necessary roles for a user to submit to sponsor. Now time for a reworking of the code. Most of these changes work in light of that discovery.

commit c3d60e82c56e70903d4afa206200f489c5472986
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Thu Jan 9 10:06:05 2014 -0700

    Removed the scenario in which a Proposal Creator (Aggregator) 'Blanket Approves' a proposal. The button (option to Blanket Approve) doesn't appear any longer.

commit fdb58f4b1f2a44ef57c3b18594bb4585083a9d0f
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Thu Jan 9 09:42:33 2014 -0700

    Edit to users.yml. Removed Bowie because 'Proposal Log PI' has no use right now. Edited other User's roles, mostly by adding the 'Proposal Submission' role.

commit dd3b228ebcfb52731863e144390053f2fd736ccb
Merge: 60633a3 b5d9b15
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Thu Jan 9 08:13:56 2014 -0700

    Merge branch 'development' of github.com:aheward/kuality-coeus into development

    * 'development' of github.com:aheward/kuality-coeus:
      Cleaned up a key personnel test scenario, simplifying the feature's background.
      Marked failing scenarios as failing.
      Changes in preparation for moving features to master branch.
      Changes to workflow and users because of new information learned.
      More maintenance repairs of old code. Lots of changes to User functionality, including updates to users.yml.  These changes may have unforeseen repercussions elsewhere.
      A number of maintenance repairs in Budget versions. Prep work beginning for merging into master branch.

    Conflicts:
    	features/proposal_development/proposal_permissions.feature

commit 60633a30907c712641bfa3cc6a57058d1ec1b287
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Thu Jan 9 08:08:25 2014 -0700

    Not quite finished, but working on a reworking of the action list result tables.

commit ce3b879dfa8cf3a3fcec1c56a2c5188a8a388a2e
Merge: 6a6c99c 8f86df4
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Fri Jan 3 10:43:35 2014 -0700

    Merge with Abe's Dev branch

commit 6a6c99c8f667c30ed78362d9e382983485de98b6
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Thu Jan 2 06:58:55 2014 -0700

    Test commit

commit 60dc378308322d244b58dfc051123a149362544f
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Mon Dec 23 10:29:30 2013 -0700

    Resolved a conflict: Now using an asterisk for background steps in prop_perms.feature

commit b2c2697d71bb58f150fb9238fd3fe87efad5d5e8
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Mon Dec 23 09:39:20 2013 -0700

    Conflicts:
    	features/proposal_development/proposal_permissions.feature

commit 2570bc6311b86c666d303288c69bd2476691136d
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Mon Dec 23 08:15:10 2013 -0700

    Stuff to get the code working.

commit 1047bb6716cf026632f84fc1a9e6d33fa3df480e
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Thu Dec 19 08:28:57 2013 -0700

    Step Definition with nested steps to complete the process of adding an institutional proposal to an award.

commit 79cac890f7897278d154b93e54049f5e66f3651b
Author: Jonathan Utter <jutter@rsmart.com>
Date:   Thu Dec 19 08:27:11 2013 -0700

    Added scenario to check for additional ip creation.
Here are some of the updated files for our PR
Combining logins and actions.

There are lots of steps that say, "I [take a certain action]." These steps require a prior step that logs in with a certain, necessary user type. So, I'm combining the steps to read like this: "The [necessary user] [takes a certain action]"
Merge branch 'test' of github.com:jonutter/kuality-coeus into development

* 'test' of github.com:jonutter/kuality-coeus:
  Combining logins and actions.
  Here are some of the updated files for our PR
  Squashed commit of the following:

Conflicts:
	features/post_award/institutional_proposal/IP_creation_via_prop_log.feature
	features/post_award/institutional_proposal/IP_link_to_award.feature
	features/post_award/kc_award/award_basic_validations.feature
	features/proposal_development/proposal_create.feature
	features/step_definitions/institutional_proposals/ip_create.rb
	features/step_definitions/institutional_proposals/ip_edit.rb
	features/step_definitions/proposal_development/proposal_create.rb