Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New branch #38

Open
wants to merge 15 commits into
base: develop
Choose a base branch
from
Prev Previous commit
Next Next commit
Merge branch 'develop' into bugfix2
joshmgrant authored Dec 7, 2020
commit c8cd7e7e98597192a14f545f1f835481aa623da0
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -6,9 +6,11 @@ Specifics for the content of this pipeline will be contained in other docs and/o
This code is provided on an "AS-IS” basis without warranty of any kind, either express or implied, including without limitation any implied warranties of condition, uninterrupted use, merchantability, fitness for a particular purpose, or non-infringement. Your tests and testing environments may require you to modify this framework. Issues regarding this framework should be submitted through GitHub. For questions regarding Sauce Labs integration, please see the Sauce Labs documentation at https://wiki.saucelabs.com/. This framework is not maintained by Sauce Labs Support.

# Pull Requests

One of the main features of this repository is to have a Jenkins pipeline kick off automatically from an open pull request. Due to the nature of this repo and its goals, please direct pull requests into the `develop` branch instead of the `master` branch.

#### Try Demo in Gitpod
Select the button below to try this demo in [Gitpod](https://www.gitpod.io/)

[![Open in Gitpod](open-in-gitpod.png)](https://gitpod.io/#https://github.com/joshmgrant/sample-Jenkins-pipeline-1/)

2 changes: 1 addition & 1 deletion test/specs/functional.spec.js
Original file line number Diff line number Diff line change
@@ -34,4 +34,4 @@ describe('Temperature converter', () => {

assert.equal(actualMessage.includes("0 Celsius is 32 Farhenheit"), true);
});
});
});
You are viewing a condensed version of this merge commit. You can view the full changes here.