Skip to content

Commit

Permalink
Merge pull request #47 from Frameworkium/relaxed_https_jira_logging
Browse files Browse the repository at this point in the history
Relaxed https jira logging + Cuke listener tag mod
  • Loading branch information
robertgates55 authored Aug 31, 2016
2 parents 837c00e + 2a2e581 commit 1a5d49f
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>com.github.Frameworkium</groupId>
<artifactId>Frameworkium-core</artifactId>
<version>2.1.0</version>
<version>2.1.1</version>
<name>Frameworkium-core</name>
<description>
Frameworkium core code.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -257,10 +257,10 @@ private List<Label> getStoryLabelsFromTags(List<Tag> tags){

private String retrieveTagValue(List<Tag> tags, String tagName){
List<String> values = new ArrayList<>();
String tagSearch = "@" + tagName + ":";
String tagSearch = "@" + tagName + "(";
for (Tag tag : tags){
if(tag.getName().startsWith(tagSearch))
values.add(tag.getName().replace(tagSearch,"").trim());
values.add(tag.getName().replace(tagSearch,"").replace(")","").trim());
}
//Return a comma separated list
return StringUtils.join(values,",");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ public class JiraConfig {
public static RequestSpecification getJIRARequestSpec() {
return given()
.baseUri(Property.JIRA_URL.getValue())
.relaxedHTTPSValidation()
.auth().preemptive().basic(
Property.JIRA_USERNAME.getValue(),
Property.JIRA_PASSWORD.getValue());
Expand Down

0 comments on commit 1a5d49f

Please sign in to comment.