Merged Selenium_1.X branch

cisco-open-source · Jul 31, 2013 · 5225b2c · 5225b2c
2 parents 1f6d53a + 1195128
commit 5225b2c
Show file tree

Hide file tree

Showing 57 changed files with 4,936 additions and 184 deletions.
diff --git a/.gitignore b/.gitignore
@@ -30,6 +30,9 @@ javascript/deps.js
 .idea/vcs.xml
 .idea/misc.xml
 .idea/workspace.xml
+.idea/projectCodeStyle.xml
+*.idea*
+*.iml
 .idea/dictionaries/
 .idea/scopes/
 out
@@ -84,3 +87,5 @@ ipch/
 /phantomjsdriver.log
 .tags
 .ruby-version
+
+*.orig
diff --git a/Rakefile b/Rakefile
@@ -171,9 +171,13 @@ task :test_remote => [
 task :test_qtwebkit => [
   '//java/client/test/org/openqa/selenium/qtwebkit:test_qtwebkit:run'
 ]
+task :test_wd_native => [  '//java/client/test/org/openqa/selenium/qtwebkit/nativetests:nativetests:run' ]
 #  '//java/server/test/org/openqa/selenium/remote/server:test_qtwebkit:run'
   #'//java/client/test/org/openqa/selenium/remote:common-tests:run',
   #'//java/client/test/org/openqa/selenium/remote:client-tests:run',
+task :test_wd_hybrid => [
+  '//java/client/test/org/openqa/selenium/qtwebkit/hybridtests:hybridtests:run'
+]
 task :test_safari => [ "//java/client/test/org/openqa/selenium/safari:test:run" ]
 task :test_phantomjs => [ "//java/client/test/org/openqa/selenium/phantomjs:test:run" ]
 task :test_support => [

diff --git a/android/android.iml b/android/android.iml
diff --git a/android/gen/org/openqa/selenium/android/app/BuildConfig.java b/android/gen/org/openqa/selenium/android/app/BuildConfig.java
@@ -0,0 +1,6 @@
+/** Automatically generated file. DO NOT MODIFY */
+package org.openqa.selenium.android.app;
+
+public final class BuildConfig {
+    public final static boolean DEBUG = true;
+}
diff --git a/java/.idea/.name b/java/.idea/.name
diff --git a/java/.idea/compiler.xml b/java/.idea/compiler.xml
diff --git a/java/.idea/copyright/profiles_settings.xml b/java/.idea/copyright/profiles_settings.xml
diff --git a/java/.idea/encodings.xml b/java/.idea/encodings.xml
diff --git a/java/.idea/libraries/internal.xml b/java/.idea/libraries/internal.xml
diff --git a/java/.idea/misc.xml b/java/.idea/misc.xml
diff --git a/java/.idea/modules.xml b/java/.idea/modules.xml
diff --git a/java/.idea/scopes/scope_settings.xml b/java/.idea/scopes/scope_settings.xml
diff --git a/java/.idea/uiDesigner.xml b/java/.idea/uiDesigner.xml
diff --git a/java/.idea/vcs.xml b/java/.idea/vcs.xml