aheward/kuality-coeus — pull request #9 by jonutter (2014-02-27 16:47:14+00:00)
Title: Squashed commit of the following:

commit 3cae43795d0a8ab256dda20af88a0234c856d2d4
Merge: 47ae996 3987b35
Author: Jonathan Utter
Date: Thu Feb 27 09:32:01 2014 -0700

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

* 'development' of github.com:aheward/kuality-coeus:
Forgot to include the passing of the array element in the block.
Tweaks to the readme. Removal of a #FIXME that was no longer needed.
Couple tweaks to the README
Added a README.md to the project
Completed fixes for IP Unlocking Award tests.
Another scenario fix. Step definition was using a bad method name.

commit 47ae9961998b5b7a95d6f82808f35fb8cc9232a7
Author: Jonathan Utter
Date: Thu Feb 27 09:31:46 2014 -0700

creates several new steps for errors including key personnel users.

commit a1fdc1cf93385cc7064540ce34de1dc4e7515046
Author: Jonathan Utter
Date: Thu Feb 27 08:59:27 2014 -0700

Resolved the scenario in irb_create_protocol.feature file

commit 2b30dd0678b7a9102c9d8e8138663d462c918f5d
Author: Jonathan Utter
Date: Wed Feb 26 10:49:34 2014 -0700

Reverting changes to the 'add a pi' step def.

commit a896b9e0c181f34ed22949d936d86a426d421b6e
Author: Jonathan Utter
Date: Wed Feb 26 10:40:32 2014 -0700

Fixing error message notifications. Also, there's a fix in this commit for a scenario in which a PI needs to be added to a Proposal.

commit 99ab1797536572bee1ebd488919f950f9552b931
Merge: 13c2cf0 e0fdcbf
Author: Jonathan Utter
Date: Wed Feb 26 09:08:30 2014 -0700

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

* 'development' of github.com:aheward/kuality-coeus:
Fixes to tests in IP Link To Award.

Conflicts:
features/post_award/institutional_proposal/IP_link_to_award.feature

commit 13c2cf0a54b603bf04d0a8c8b7b51929b057be8f
Author: Jonathan Utter
Date: Wed Feb 26 08:34:57 2014 -0700

Added the third required role the osp admin user in the background step

commit 047d35faa4e6c616a5b9c0c5b27ef1d50eee7cb3
Author: Jonathan Utter
Date: Tue Feb 25 15:10:29 2014 -0700

added the 'Institutional Proposal Maintainer' role to the user who is required to submit PDs to their sponsors, and maintain the IPs they generate.

commit 4c1f584be46a934f9aad58784b9624278a6b6c3e
Merge: c515721 7184b90
Author: Jonathan Utter
Date: Tue Feb 25 14:57:35 2014 -0700

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

* 'development' of github.com:aheward/kuality-coeus:
Correction to a background step that needed an additional role for it to work in the scenario.

commit c5157218007abff0d69982874a43e49942ee2058
Author: Jonathan Utter
Date: Tue Feb 25 14:57:21 2014 -0700

Changed the step def dialogue back so that the step can check from each of the approval-related buttons

commit 7e396067260232897be3dbe5533fea03507e42d0
Author: Jonathan Utter
Date: Tue Feb 25 14:36:43 2014 -0700

Added a block for 'button'

commit 7f7585bd036be315e61a708b7b7733dcbe5ecabb
Author: Jonathan Utter
Date: Tue Feb 25 14:25:31 2014 -0700

Grammatical step def correction.

commit fd6ddaf51243a95b2c1e1dcfce1f36d17a170ad9
Merge: 193063c 4aee3dd
Author: Jonathan Utter
Date: Tue Feb 25 12:48:56 2014 -0700

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

* 'development' of github.com:aheward/kuality-coeus:
Added a method to ProposalDevelopmentObject for approving from the Action List.
Added a new feature file that will improve one of the test scenarios.

Conflicts:
features/step_definitions/proposal_development/proposal_workflow.rb

commit 193063ca04c5be2a0b181f1d1c1250599fb66af0
Author: Jonathan Utter
Date: Tue Feb 25 12:36:30 2014 -0700

Replaced the step verbiage in this file