Merge branch 'hotfix/0.18.7'

garex · Apr 17, 2016 · ce7a7ef · ce7a7ef
2 parents 454ed4d + 18441ee
commit ce7a7ef
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 51 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,6 +9,7 @@ env:
     - DB_ENGINE=InnoDB
   matrix:
     - WP_VERSION=
+    - WP_VERSION=4.4.2
     - WP_VERSION=4.3.1
     - WP_VERSION=4.2.4
     - WP_VERSION=4.1.5

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@
 ## Changelog ##
 
 
+### 0.18.7 ###
+
+Welcome WordPress 4.5
+
+* Upgrade autotests
+
+
 ### 0.18.6 ###
 
 Add result's page extension point and PHP7 support

diff --git a/README.md b/README.md
diff --git a/composer.json b/composer.json
@@ -156,30 +156,6 @@
                     "type": "zip"
                 }
             }
-        },
-        {
-            "type": "package",
-            "package": {
-                "name": "xrstf/composer-php52",
-                "version": "v1.100",
-                "autoload": {
-                    "psr-0": {
-                        "xrstf\\Composer52": "lib/"
-                    }
-                },
-                "scripts": {
-                    "post-install-cmd": [
-                        "xrstf\\Composer52\\Generator::onPostInstallCmd"
-                    ],
-                    "post-update-cmd": [
-                        "xrstf\\Composer52\\Generator::onPostInstallCmd"
-                    ]
-                },
-                "dist": {
-                    "url": "https://bitbucket.org/garex/composer-php52/get/upgrade-getAutoloadRealFile-signature.zip",
-                    "type": "zip"
-                }
-            }
         }
     ]
 }
diff --git a/composer.lock.dist b/composer.lock.dist
diff --git a/js/test-add-answers.js b/js/test-add-answers.js
@@ -1,6 +1,6 @@
 jQuery(document).ready(function($) {
     var superBox                = $('#wpt_edit_questions'),
-        globalAnswerLink        = superBox.find('a[href=#wpt_answerdiv]'),
+        globalAnswerLink        = superBox.find('a[href="#wpt_answerdiv"]'),
         globalAnswer            = $('#wpt_answerdiv'),
         globalAnswerHandler     = globalAnswer.find('.hndle'),
         individualAnswers       = superBox.find('.wpt-add-individual-answers'),

diff --git a/tests/integration-environment/create.sh b/tests/integration-environment/create.sh
@@ -6,7 +6,7 @@ set -e
 HERE=$(dirname $0)
 DB_ENGINE=${DB_ENGINE:-InnoDB}
 DB_CHARSET=${DB_CHARSET:-utf8}
-WP_VERSION=${WP_VERSION:-4.4.2}
+WP_VERSION=${WP_VERSION:-latest}
 WP_UPGRADE=${WP_UPGRADE:-0}
 WP_T_SERVER=${WP_T_SERVER:-http://wpti.dev:8000}
 PLUGINS=${PLUGINS:-}

diff --git a/tests/mocha/test/0-plugin.js b/tests/mocha/test/0-plugin.js
@@ -73,7 +73,7 @@ describe('Plugin activation', function() {
 
         casper.waitForUrl(/activate/, function() {
             'Fatal'.should.not.be.textInDOM
-            '#wp-testing .deactivate a'.should.be.inDOM
+            '#wp-testing .deactivate a,[data-slug=wp-testing] .deactivate a'.should.be.inDOM
         }, null, 60000)
     })
 })
diff --git a/tests/mocha/test/z-plugin-deactivation.js b/tests/mocha/test/z-plugin-deactivation.js
@@ -19,26 +19,26 @@ describe('Plugin deactivation', function() {
        })
 
        casper.then(function() {
-           this.click('#wp-testing .deactivate a')
+           this.click('#wp-testing .deactivate a, [data-slug=wp-testing] .deactivate a')
        })
 
        casper.then(function() {
-           '#wp-testing .activate a'.should.be.inDOM
-           '#wp-testing .delete a'.should.be.inDOM
+           '#wp-testing .activate a, [data-slug=wp-testing] .activate a'.should.be.inDOM
+           '#wp-testing .delete a, [data-slug=wp-testing] .delete a'.should.be.inDOM
        })
     })
 
     it('should be deleted', function() {
        casper.then(function() {
-           this.click('#wp-testing .delete a')
+           this.click('#wp-testing .delete a, [data-slug=wp-testing] .delete a')
        })
 
        casper.waitForUrl(/delete/, function() {
            this.click('#submit')
        })
 
        casper.then(function() {
-           '#wp-testing'.should.not.be.inDOM
+           '#wp-testing, [data-slug=wp-testing]'.should.not.be.inDOM
        })
     })
 

diff --git a/wp-testing.php b/wp-testing.php
@@ -3,7 +3,7 @@
  * Plugin Name: Wp-testing
  * Plugin URI: http://wordpress.org/extend/plugins/wp-testing/
  * Description: Helps to create psychological tests.
- * Version: 0.18.6
+ * Version: 0.18.7
  * Author: Alexander Ustimenko
  * Author URI: http://ustimen.co
  * License: GPL3