From d9e6ba855243522b50f3743cb857ceeda745c229 Mon Sep 17 00:00:00 2001 From: Andrew Krug Date: Sun, 27 Nov 2016 11:39:52 -0500 Subject: [PATCH 1/9] adding in the travis yaml file --- .travis.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..f5c99a7 --- /dev/null +++ b/.travis.yml @@ -0,0 +1 @@ +language: java \ No newline at end of file From 935fcdaa20cfc95db7c3c426f530a63d70a33292 Mon Sep 17 00:00:00 2001 From: Andrew Krug Date: Sun, 27 Nov 2016 11:47:24 -0500 Subject: [PATCH 2/9] adding in jcenter maven repo for nunit --- pom.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pom.xml b/pom.xml index c515445..57a1473 100644 --- a/pom.xml +++ b/pom.xml @@ -8,6 +8,14 @@ javajenkins 1.0-SNAPSHOT + + + jcenter + bintray + http://jcenter.bintray.com + + + org.seleniumhq.selenium From e1bb85fcf1647002ea17bee5c3910d62bf1c33cd Mon Sep 17 00:00:00 2001 From: Andrew Krug Date: Sun, 27 Nov 2016 11:59:24 -0500 Subject: [PATCH 3/9] removing jcenter from maven repo for nunit updating version number to use maven central --- pom.xml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 57a1473..fb5f54d 100644 --- a/pom.xml +++ b/pom.xml @@ -8,13 +8,6 @@ javajenkins 1.0-SNAPSHOT - - - jcenter - bintray - http://jcenter.bintray.com - - @@ -25,7 +18,7 @@ org.testng testng - 6.9.12 + 6.9.13.6 test From 2f7ff41bb599f39ae4b6cda5e7d7a17c221a9a2a Mon Sep 17 00:00:00 2001 From: Andrew Krug Date: Sun, 27 Nov 2016 12:05:27 -0500 Subject: [PATCH 4/9] adding in before install instructions to travis.yml --- .travis.yml | 7 ++++++- javajenkins.iml | 8 ++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index f5c99a7..9ef2912 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1 +1,6 @@ -language: java \ No newline at end of file +language: java +before_install: + - brew update + - brew install geckodriver + - brew install caskroom + - brew cask install firefox diff --git a/javajenkins.iml b/javajenkins.iml index cef2175..d156e55 100644 --- a/javajenkins.iml +++ b/javajenkins.iml @@ -52,10 +52,10 @@ - - + - - + + + \ No newline at end of file From 72e969e769c2eab6fb1155a7e45e30b418efe345 Mon Sep 17 00:00:00 2001 From: Andrew Krug Date: Sun, 27 Nov 2016 12:10:02 -0500 Subject: [PATCH 5/9] modifying before install to just install geckodriver --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9ef2912..86fa031 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,3 @@ language: java before_install: - - brew update - brew install geckodriver - - brew install caskroom - - brew cask install firefox From 4eac2ab092b661488a49e5805603b8547b0854c9 Mon Sep 17 00:00:00 2001 From: Andrew Krug Date: Sun, 27 Nov 2016 12:13:33 -0500 Subject: [PATCH 6/9] adding in osx to build instructions --- .idea/libraries/Maven__org_apache_ant_ant_1_7_0.xml | 13 ------------- .../Maven__org_apache_ant_ant_launcher_1_7_0.xml | 13 ------------- .idea/libraries/Maven__org_testng_testng_6_9_12.xml | 13 ------------- .travis.yml | 1 + 4 files changed, 1 insertion(+), 39 deletions(-) delete mode 100644 .idea/libraries/Maven__org_apache_ant_ant_1_7_0.xml delete mode 100644 .idea/libraries/Maven__org_apache_ant_ant_launcher_1_7_0.xml delete mode 100644 .idea/libraries/Maven__org_testng_testng_6_9_12.xml diff --git a/.idea/libraries/Maven__org_apache_ant_ant_1_7_0.xml b/.idea/libraries/Maven__org_apache_ant_ant_1_7_0.xml deleted file mode 100644 index 8124522..0000000 --- a/.idea/libraries/Maven__org_apache_ant_ant_1_7_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_ant_ant_launcher_1_7_0.xml b/.idea/libraries/Maven__org_apache_ant_ant_launcher_1_7_0.xml deleted file mode 100644 index 78f510c..0000000 --- a/.idea/libraries/Maven__org_apache_ant_ant_launcher_1_7_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_testng_testng_6_9_12.xml b/.idea/libraries/Maven__org_testng_testng_6_9_12.xml deleted file mode 100644 index d68bdcd..0000000 --- a/.idea/libraries/Maven__org_testng_testng_6_9_12.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 86fa031..5f51be9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,4 @@ +os: osx language: java before_install: - brew install geckodriver From 94baee2a6a5eedfdeb38f885e3e362c7e28102aa Mon Sep 17 00:00:00 2001 From: Andrew Krug Date: Sun, 27 Nov 2016 15:09:06 -0500 Subject: [PATCH 7/9] updating surefire version --- pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pom.xml b/pom.xml index fb5f54d..9711d1c 100644 --- a/pom.xml +++ b/pom.xml @@ -23,4 +23,15 @@ + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.19.1 + + + + \ No newline at end of file From 15fc431d949c087488ae83abe3d6fa96b5f817c9 Mon Sep 17 00:00:00 2001 From: Andrew Krug Date: Sun, 27 Nov 2016 15:19:58 -0500 Subject: [PATCH 8/9] updating firefox path --- src/test/java/SampleTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/SampleTest.java b/src/test/java/SampleTest.java index d56dc50..6ffef14 100644 --- a/src/test/java/SampleTest.java +++ b/src/test/java/SampleTest.java @@ -23,7 +23,7 @@ public void testSetup() { DesiredCapabilities caps = DesiredCapabilities.chrome(); DesiredCapabilities capabilities = DesiredCapabilities.firefox(); capabilities.setCapability("marionette", true); - FirefoxBinary ff = new FirefoxBinary(new File("/Applications/Firefox.app/Contents/MacOS/firefox")); + FirefoxBinary ff = new FirefoxBinary(new File("/Applications/Firefox.app/Contents/MacOS/firefox-bin")); FirefoxProfile ffp = new FirefoxProfile(); driver = new FirefoxDriver(ff, ffp, capabilities); } From 6cf87fe284a080f9304880d0c727f582dcf2e2d2 Mon Sep 17 00:00:00 2001 From: Andrew Krug Date: Sun, 27 Nov 2016 15:25:10 -0500 Subject: [PATCH 9/9] updating travis to install firefox --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 5f51be9..0bdbfe4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,6 @@ os: osx language: java before_install: + - brew update - brew install geckodriver + - brew cask install firefox