Skip to content
This repository has been archived by the owner on Oct 1, 2020. It is now read-only.

Commit

Permalink
Merge branch 'master' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
kierk authored Nov 8, 2018
2 parents 8fcec9a + 075868b commit a91062f
Show file tree
Hide file tree
Showing 3 changed files with 69 additions and 8 deletions.
38 changes: 38 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# Welcome!
Thank you for contributing to CDC's Open Source projects! If you have any
questions or doubts, don't be afraid to send them our way. We appreciate all
contributions, and we are looking forward to fostering an open, transparent, and
collaborative environment.

Before contributing, we encourage you to also read or [LICENSE](https://github.com/CDCgov/template/blob/master/LICENSE),
[README](https://github.com/CDCgov/template/blob/master/README.md), and
[code-of-conduct](https://github.com/CDCgov/template/blob/master/code-of-conduct.md)
files, also found in this repository. If you have any inquiries or questions not
answered by the content of this repository, feel free to [contact us](mailto:[email protected]).

## Public Domain
This project is in the public domain within the United States, and copyright and
related rights in the work worldwide are waived through the [CC0 1.0 Universal public domain dedication](https://creativecommons.org/publicdomain/zero/1.0/).
All contributions to this project will be released under the CC0 dedication. By
submitting a pull request you are agreeing to comply with this waiver of
copyright interest.

## Requesting Changes
Our pull request/merging process is designed to give the CDC Surveillance Team
and other in our space an opportunity to consider and discuss any suggested
changes. This policy affects all CDC spaces, both on-line and off, and all users
are expected to abide by it.

### Open an issue in the repository
If you don't have specific language to submit but would like to suggest a change
or have something addressed, you can open an issue in this repository. Team
members will respond to the issue as soon as possible.

### Submit a pull request
If you would like to contribute, please submit a pull request. In order for us
to merge a pull request, it must:
* Be at least seven days old. Pull requests may be held longer if necessary
to give people the opportunity to assess it.
* Receive a +1 from a majority of team members associated with the request.
If there is significant dissent between the team, a meeting will be held to
discuss a plan of action for the pull request.
23 changes: 23 additions & 0 deletions DISCLAIMER.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# DISCLAIMER
Use of this service is limited only to **non-sensitive and publicly available
data**. Users must not use, share, or store any kind of sensitive data like
health status, provision or payment of healthcare, Personally Identifiable
Information (PII) and/or Protected Health Information (PHI), etc. under **ANY**
circumstance.

Administrators for this service reserve the right to moderate all information
used, shared, or stored with this service at any time. Any user that cannot
abide by this disclaimer and Code of Conduct may be subject to action, up to
and including revoking access to services.

The material embodied in this software is provided to you "as-is" and without
warranty of any kind, express, implied or otherwise, including without
limitation, any warranty of fitness for a particular purpose. In no event shall
the Centers for Disease Control and Prevention (CDC) or the United States (U.S.)
government be liable to you or anyone else for any direct, special, incidental,
indirect or consequential damages of any kind, or any damages whatsoever,
including without limitation, loss of profit, loss of use, savings or revenue,
or the claims of third parties, whether or not CDC or the U.S. government has
been advised of the possibility of such loss, however caused and on any theory
of liability, arising out of or in connection with the possession, use or
performance of this software.
16 changes: 8 additions & 8 deletions features/manage_surveys.feature
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ Feature: Manage Surveys
And I should see "Version 1 (Trial Use)"
And I should see "Visibility: Draft (authors and publishers only)"

Scenario: Show published Survey to unauthenticated user
Given I have a published Survey with the name "Test Survey" and the description "Survey description"
When I go to the list of Surveys
And I click on the menu link for the Survey with the name "Test Survey"
And I click on the option to Details the Survey with the name "Test Survey"
Then I should see "Test Survey"
And I should see "Survey description"
And I should not see "Curate"
Scenario: Show published Survey to unauthenticated user
Given I have a published Survey with the name "Test Survey" and the description "Survey description"
When I go to the list of Surveys
And I click on the menu link for the Survey with the name "Test Survey"
And I click on the option to Details the Survey with the name "Test Survey"
Then I should see "Test Survey"
And I should see "Survey description"
And I should not see "Curate"

Scenario: Send a Draft Survey to a Publisher
Given I have a Survey with the name "Test Survey" and the description "Survey description"
Expand Down

0 comments on commit a91062f

Please sign in to comment.