Release 2.0.3

- Fixed bug which ignored config files. - Also updated example config files to include more properties.
Frameworkium · Jun 22, 2016 · 9609a5d · 9609a5d
1 parent 7638338
commit 9609a5d
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -46,13 +46,13 @@ script:
   #- java -jar selenium-server-standalone-$SELENIUM_VER.jar -role node -hub http://localhost:4444/grid/register -browser browserName=chrome,maxInstances=$THREAD_COUNT -port 5556 > /dev/null 2>&1 &
 
   # Run on Firefox on the grid
-  - mvn verify -Dthreads=$THREAD_COUNT -Dconfig=FirefoxGrid.yaml -DcaptureURL=$CAPTURE_URL -DsutName="$SUT_NAME" -DsutVersion="$SUT_VERSION"
+  - mvn verify -B -Dthreads=$THREAD_COUNT -Dconfig=FirefoxGrid.yaml -DcaptureURL=$CAPTURE_URL -DsutName="$SUT_NAME" -DsutVersion="$SUT_VERSION"
   # Run on chrome on the grid
   # chromium crashes and google chrome doesn't work on travis
   # - mvn verify -Dthreads=$THREAD_COUNT -Dbrowser=chrome -DgridURL=http://localhost:4444/wd/hub -DcaptureURL=$CAPTURE_URL -DsutName="$SUT_NAME" -DsutVersion="$SUT_VERSION"
   # Run and log to Jira
-  - mvn verify -Dthreads=$THREAD_COUNT -Dconfig=FirefoxGrid.yaml -DjiraURL="http://52.29.130.45:8080" -DjqlQuery="issueKey=TEST-1" -DresultVersion="BUILD TEST VERSION" -DzapiCycleRegex="Test Cycle" -DjiraUsername=frameworkium -DjiraPassword=frameworkium
+  - mvn verify -B -Dthreads=$THREAD_COUNT -Dconfig=FirefoxGrid.yaml -DjiraURL="http://52.29.130.45:8080" -DjqlQuery="issueKey=TEST-1" -DresultVersion="BUILD TEST VERSION" -DzapiCycleRegex="Test Cycle" -DjiraUsername=frameworkium -DjiraPassword=frameworkium
   # Run on sauce
   # - mvn verify -Dsauce=true -Dplatform=ios -Dbrowser=safari -DplatformVersion=8.0 -Ddevice=iPad -DcaptureURL=$CAPTURE_URL -DsutName="$SUT_NAME" -DsutVersion="$SUT_VERSION"
   # generate allure report
-  - mvn site
+  - mvn site -B -q
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>com.frameworkium</groupId>
   <artifactId>Frameworkium-core</artifactId>
-  <version>2.0.3-SNAPSHOT</version>
+  <version>2.0.3</version>
 
   <name>Frameworkium-core</name>
   <description>

diff --git a/src/main/java/com/frameworkium/core/common/properties/Property.java b/src/main/java/com/frameworkium/core/common/properties/Property.java
@@ -52,7 +52,7 @@ private String retrieveValue(String key) {
     }
 
     private String getValueFromConfigFile(String key) {
-        if (configMap != null) {
+        if (configMap == null) {
             loadConfigFile();
         }
 

diff --git a/src/main/resources/BrowserStackIPad.yaml b/src/main/resources/BrowserStackIPad.yaml
@@ -22,3 +22,5 @@ jiraUsername:
 jiraPassword:
 maximise:
 resolution:
+proxy:
+maxRetryCount:
diff --git a/src/main/resources/Firefox.yaml b/src/main/resources/Firefox.yaml
@@ -1,4 +1,5 @@
 browser: Firefox
+firefoxProfile:
 browserVersion:
 platform:
 platformVersion:
@@ -22,3 +23,5 @@ jiraUsername:
 jiraPassword:
 maximise:
 resolution:
+proxy:
+maxRetryCount:
diff --git a/src/main/resources/FirefoxGrid.yaml b/src/main/resources/FirefoxGrid.yaml
@@ -22,3 +22,5 @@ jiraUsername:
 jiraPassword:
 maximise:
 resolution:
+proxy:
+maxRetryCount:
diff --git a/src/main/resources/SauceLabsAndroid.yaml b/src/main/resources/SauceLabsAndroid.yaml
@@ -17,3 +17,5 @@ jiraUsername:
 jiraPassword:
 maximise:
 resolution:
+proxy:
+maxRetryCount: