Merge pull request #2670 from mozilla/kapow

Kapow!
mozilla · Nov 15, 2012 · cec83da · cec83da
2 parents 3a4e816 + cb9bb4c
commit cec83da
Show file tree

Hide file tree

Showing 112 changed files with 3,532 additions and 2,913 deletions.
diff --git a/.awsbox.json b/.awsbox.json
@@ -12,9 +12,12 @@
     "CONFIG_FILES": "$HOME/code/config/production.json,$HOME/code/config/aws.json,$HOME/config.json"
   },
   "hooks": {
-    "postdeploy": "scripts/awsbox/post_deploy.sh",
-    "poststart": "scripts/show_config.js",
-    "postcreate": "scripts/awsbox/post_create.sh"
+    "postdeploy": "scripts/awsbox_remote/post_deploy.sh",
+    "poststart": "scripts/awsbox_remote/post_start.sh",
+    "postcreate": "scripts/awsbox_remote/post_create.sh"
+  },
+  "local_hooks": {
+    "postcreate": "node scripts/awsbox_local/post_create.js"
   },
   "packages": [
     "mysql-server"

diff --git a/.gitignore b/.gitignore
@@ -16,11 +16,6 @@
 Thumbs.db
 /locale
 /resources/email_templates/email-test.html
-/automation-tests/bid_selenium
+/automation-tests/node_modules
 /automation-tests/results
-/automation-tests/credentials.yaml
-/automation-tests/sauce.yaml
-automation-tests/persona_server/results/*
-/automation-tests/chromedriver.log
-/.coverage_data
-/cover_html
+/automation-tests/*.jar
diff --git a/.travis.yml b/.travis.yml
@@ -25,6 +25,7 @@ env:
  - WHAT_TESTS=front MYSQL_USER=root
  - WHAT_TESTS=back_mysql MYSQL_USER=root
  - WHAT_TESTS=back
+ - WHAT_TESTS=selenium
 
 mysql:
   adapter: mysql2

diff --git a/automation-tests/123done/mocks/__init__.py b/automation-tests/123done/mocks/__init__.py
diff --git a/automation-tests/123done/mocks/mock_user.py b/automation-tests/123done/mocks/mock_user.py
diff --git a/automation-tests/123done/mozwebqa.cfg b/automation-tests/123done/mozwebqa.cfg
diff --git a/automation-tests/123done/page.py b/automation-tests/123done/page.py
diff --git a/automation-tests/123done/pages/__init__.py b/automation-tests/123done/pages/__init__.py
diff --git a/automation-tests/123done/pages/home.py b/automation-tests/123done/pages/home.py
diff --git a/automation-tests/123done/restmail/__init__.py b/automation-tests/123done/restmail/__init__.py
diff --git a/automation-tests/123done/restmail/restmail.py b/automation-tests/123done/restmail/restmail.py
diff --git a/automation-tests/123done/tests/__init__.py b/automation-tests/123done/tests/__init__.py
diff --git a/automation-tests/123done/tests/test_change_password.py b/automation-tests/123done/tests/test_change_password.py
diff --git a/automation-tests/123done/tests/test_logout.py b/automation-tests/123done/tests/test_logout.py
diff --git a/automation-tests/123done/tests/test_new_user.py b/automation-tests/123done/tests/test_new_user.py