You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2017/06/09 19:15:42 UTC
[1/4] git commit: [flex-asjs] [refs/heads/release0.8.0] - try delay
before making dir. Occasionally get an error
Repository: flex-asjs
Updated Branches:
refs/heads/release0.8.0 dd6fc270e -> d7c7b9ae6
try delay before making dir. Occasionally get an error
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/c596b16a
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/c596b16a
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/c596b16a
Branch: refs/heads/release0.8.0
Commit: c596b16af4f695a9df95e7886e1debaff0794610
Parents: dd6fc27
Author: Alex Harui <ah...@apache.org>
Authored: Fri Jun 9 00:21:42 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Jun 9 00:21:42 2017 -0700
----------------------------------------------------------------------
build.xml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c596b16a/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 6320bd4..d957bf8 100644
--- a/build.xml
+++ b/build.xml
@@ -578,7 +578,9 @@
<target name="stage-source-no-scripts" depends="check-flex-home" >
<antcall target="clean-temp"/>
-
+ <sleep seconds="3" />
+ <mkdir dir="${basedir}/temp"/>
+
<copy todir="${basedir}/temp" includeEmptyDirs="false">
<fileset dir="${basedir}">
<include name="build.xml"/>
[2/4] git commit: [flex-asjs] [refs/heads/release0.8.0] - add firefox
profile support. Some machines need it to get around extensions that get in
the way
Posted by ah...@apache.org.
add firefox profile support. Some machines need it to get around extensions that get in the way
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/f8cccea0
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/f8cccea0
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/f8cccea0
Branch: refs/heads/release0.8.0
Commit: f8cccea06c2f9613c4fa970050860c413a82ada2
Parents: c596b16
Author: Alex Harui <ah...@apache.org>
Authored: Fri Jun 9 12:09:32 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Jun 9 12:09:32 2017 -0700
----------------------------------------------------------------------
mustella/java/src/marmotinni/MarmotinniRunner.java | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f8cccea0/mustella/java/src/marmotinni/MarmotinniRunner.java
----------------------------------------------------------------------
diff --git a/mustella/java/src/marmotinni/MarmotinniRunner.java b/mustella/java/src/marmotinni/MarmotinniRunner.java
index a2f85e4..73061fd 100644
--- a/mustella/java/src/marmotinni/MarmotinniRunner.java
+++ b/mustella/java/src/marmotinni/MarmotinniRunner.java
@@ -24,6 +24,8 @@ import org.openqa.selenium.WebDriver;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.firefox.FirefoxDriver;
import org.openqa.selenium.chrome.ChromeDriver;
+import org.openqa.selenium.firefox.FirefoxProfile;
+import org.openqa.selenium.firefox.internal.ProfilesIni;
import java.io.IOException;
import java.nio.CharBuffer;
@@ -214,6 +216,13 @@ public class MarmotinniRunner extends DefaultHandler {
WebDriver driver;
if (browser != null && browser.equalsIgnoreCase("chrome"))
driver = new ChromeDriver();
+ else if (argsMap.containsKey("profile"))
+ {
+ ProfilesIni profile = new ProfilesIni();
+ FirefoxProfile ffprofile = profile.getProfile(argsMap.get("profile"));
+ System.out.println("FireFox Profile: " + argsMap.get("profile"));
+ driver = new FirefoxDriver(ffprofile);
+ }
else
driver = new FirefoxDriver();
[3/4] git commit: [flex-asjs] [refs/heads/release0.8.0] - support
profiles and clean tests before compiling
Posted by ah...@apache.org.
support profiles and clean tests before compiling
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/9fb516ca
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/9fb516ca
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/9fb516ca
Branch: refs/heads/release0.8.0
Commit: 9fb516cad2ef4d31b5bcf70da92f35db5b2e952e
Parents: f8cccea
Author: Alex Harui <ah...@apache.org>
Authored: Fri Jun 9 12:10:08 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Jun 9 12:10:08 2017 -0700
----------------------------------------------------------------------
build.xml | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fb516ca/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index d957bf8..a040a8c 100644
--- a/build.xml
+++ b/build.xml
@@ -460,7 +460,6 @@
<!--
<ant dir="${basedir}/ide/flashbuilder" target="clean" />
-->
- <delete dir="${basedir}/mustella/tests/bin" failonerror="false" includeEmptyDirs="true"/>
</target>
<target name="examples-clean">
@@ -479,6 +478,8 @@
</target>
<target name="checkintests-clean" depends="clean-dependencychecker">
+ <delete file="${basedir}/mustella/tests/basicTests/BasicTestsApp.swf" failonerror="false"/>
+ <delete dir="${basedir}/mustella/tests/bin" failonerror="false" includeEmptyDirs="true"/>
</target>
<target name="player-clean">
@@ -1178,7 +1179,7 @@
-->
<!--<target name="checkintests" description="Run these tests before every checkin" />-->
- <target name="checkintests" depends="basictests-mustella,basictests-marmotinni" description="Run these tests before every checkin" />
+ <target name="checkintests" depends="checkintests-clean,basictests-mustella,basictests-marmotinni" description="Run these tests before every checkin" />
<!--<target name="checkintests" depends="dependencychecker-framework,basictests-mustella,checkintests-mobile" description="Run these tests before every checkin"/-->
<!--
@@ -1196,6 +1197,7 @@
<target name="basictests-js" depends="basictests-compile-js,basictests-compile-java,basictests-run-js" />
<target name="basictests-run-js" >
+ <property name="profile_arg" value="dummy=false" />
<echo>url=file://${basedir}/mustella/tests/basicTests/bin/js-debug/index.html</echo>
<echo>script=${basedir}/mustella/tests/basicTests/halo/scripts/ButtonTestScript.mxml</echo>
<echo>script=${basedir}/mustella/tests/basicTests/halo/scripts/CheckBoxTestScript.mxml</echo>
@@ -1205,6 +1207,7 @@
<arg value="script=${basedir}/mustella/tests/basicTests/halo/scripts/ButtonTestScript.mxml" />
<arg value="script=${basedir}/mustella/tests/basicTests/halo/scripts/CheckBoxTestScript.mxml" />
<!--<arg value="showSteps=true" />-->
+ <arg value="${profile_arg}" />
<classpath>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/selenium-java-2.53.1.jar"/>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/apache-mime4j-0.6.jar"/>
[4/4] git commit: [flex-asjs] [refs/heads/release0.8.0] - fix
checkintests
Posted by ah...@apache.org.
fix checkintests
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/d7c7b9ae
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/d7c7b9ae
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/d7c7b9ae
Branch: refs/heads/release0.8.0
Commit: d7c7b9ae65bff55c2710a10032f1a39c04fe83dc
Parents: 9fb516c
Author: Alex Harui <ah...@apache.org>
Authored: Fri Jun 9 12:14:21 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Jun 9 12:14:21 2017 -0700
----------------------------------------------------------------------
build.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d7c7b9ae/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index a040a8c..4eb2bbb 100644
--- a/build.xml
+++ b/build.xml
@@ -1431,11 +1431,11 @@
closure-lib="${env.GOOG_HOME}"
file="${basedir}/mustella/tests/basicTests/BasicTestsApp.mxml">
<jvmarg line="${mxmlc.jvm.args}"/>
- <swf-library-path dir="${FLEX_SDK_HOME}" append="true">
+ <library-path dir="${FLEX_SDK_HOME}" append="true">
<include name="mustella/mustella.swc"/>
<include name="frameworks/libs/framework.swc"/>
<include name="frameworks/locale/en_US/framework_rb.swc"/>
- </swf-library-path>
+ </library-path>
<js-external-library-path dir="${basedir}">
<include name="js/libs/js.swc"/>
</js-external-library-path>