Merge branch 'release/0.19.2'

garex · Aug 30, 2016 · 8a4ab72 · 8a4ab72
2 parents 198c06d + 919af16
commit 8a4ab72
Show file tree

Hide file tree

Showing 16 changed files with 56 additions and 38 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -36,7 +36,7 @@ matrix:
     - php: 5.3
       env: DB_ENGINE=MyISAM DB_CHARSET=latin1 WP_UPGRADE=1
     - php: 5.4
-      env: PLUGINS=akismet.3.1.4:jetpack.3.7:wordpress-seo.2.3.5:wordfence.6.0.17:contact-form-7.4.3:google-sitemap-generator.4.0.8
+      env: PLUGINS=akismet.3.1.11:jetpack.4.2.2:wordpress-seo.3.3.4:wordfence.6.1.14:contact-form-7.4.5:google-sitemap-generator.4.0.8
   allow_failures:
     - php: 5.2
       env: WP_VERSION=3.5

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,14 @@
 ## Changelog ##
 
 
+### 0.19.2 ###
+
+Welcome WordPress 4.6
+
+* Upgrade autotests
+* No new functionality was added!
+
+
 ### 0.19.1 ###
 
 Partial fix of Glossary-like plugins incompatibility

diff --git a/README.md b/README.md
@@ -4,8 +4,8 @@
 **Donate link:** https://www.paypal.me/Ustimenko/19.83eur
 **Tags:** psychological, testing, test, quiz
 **Requires at least:** 3.2
-**Tested up to:** 4.5.3
-**Stable tag:** 0.19.1
+**Tested up to:** 4.6
+**Stable tag:** 0.19.2
 **License:** GPLv3
 **License URI:** http://www.gnu.org/licenses/gpl-3.0.html
 

diff --git a/src/Addon/IFacade.php b/src/Addon/IFacade.php
@@ -1,6 +1,6 @@
 <?php
 
-interface WpTesting_Addon_IFacade
+interface WpTesting_Addon_IFacade extends WpTesting_Facade_IORM
 {
 
     /**

diff --git a/src/Facade.php b/src/Facade.php
@@ -1,6 +1,6 @@
 <?php
 
-class WpTesting_Facade implements WpTesting_Addon_IFacade, WpTesting_Facade_IORM, WpTesting_Facade_ITestPasser
+class WpTesting_Facade implements WpTesting_Addon_IFacade, WpTesting_Facade_ITestPasser
 {
 
     private $doers = array();

diff --git a/src/bootstrap.php b/src/bootstrap.php
@@ -7,7 +7,7 @@
 require_once dirname(__FILE__) . '/WordPress/IPath.php';
 require_once dirname(__FILE__) . '/Addon/IWordPressFacade.php';
 require_once dirname(__FILE__) . '/WordPressFacade.php';
-require_once dirname(__FILE__) . '/Addon/IFacade.php';
 require_once dirname(__FILE__) . '/Facade/IORM.php';
+require_once dirname(__FILE__) . '/Addon/IFacade.php';
 require_once dirname(__FILE__) . '/Facade/ITestPasser.php';
 require_once dirname(__FILE__) . '/Facade.php';
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:-latest}
+WP_VERSION=${WP_VERSION:-4.6}
 WP_UPGRADE=${WP_UPGRADE:-0}
 WP_LINK_SELF=${WP_LINK_SELF:-0}
 WP_T_SERVER=${WP_T_SERVER:-http://wpti.dev:8000}
@@ -36,7 +36,7 @@ function db {
 function setup_link {
     log 'Setting up symbolic link'
     rm --force --recursive /tmp/wpti
-    cp --recursive $HERE /tmp/wpti
+    cp --preserve=mode,ownership,timestamps --recursive $HERE /tmp/wpti
 }
 
 function start_nginx {
@@ -78,8 +78,8 @@ function install_wp {
     tar --extract --ungzip --file=wordpress-$WP_VERSION.tar.gz --directory=..
     cd ../wordpress
     log '.. clean up plugins'
-    rm --recursive --force wp-content/plugins
-    mkdir --parents wp-content/plugins
+    rm --recursive --force wp-content/plugins wp-content/upgrade
+    mkdir --parents wp-content/plugins wp-content/upgrade
     if [ -f $WP_PATCH ];
     then
         # To create patch use: diff --unified path/to/original.php path/to/fix.php > $WP_PATCH
@@ -93,6 +93,7 @@ function install_wp {
 
 function set_db_engine {
     log "Setting DB engine to $DB_ENGINE"
+    mysql --user=root --execute 'SET GLOBAL sql_mode = "ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION"'
     mysql --user=root wpti --execute 'SHOW TABLES' | tail -n+2 | xargs -i mysql wpti --execute "ALTER TABLE {} ENGINE=$DB_ENGINE"
 }
 

diff --git a/tests/mocha/mocha-casperjs.opts b/tests/mocha/mocha-casperjs.opts
@@ -0,0 +1 @@
+--log-level=info
diff --git a/tests/mocha/test/0-plugin.js b/tests/mocha/test/0-plugin.js
@@ -53,7 +53,7 @@ describe('Plugin activation', function() {
 
         casper.waitForSelector('.jetpack-module.active', function() {
             'Fatal'.should.not.be.textInDOM
-        }, null, 60000)
+        }, null, 90000)
 
         casper.thenOpen(server + '/wp-admin/plugins.php', function () {
             expect(/Plugins/).to.matchTitle
@@ -74,6 +74,6 @@ describe('Plugin activation', function() {
         casper.waitForUrl(/activate/, function() {
             'Fatal'.should.not.be.textInDOM
             '#wp-testing .deactivate a,[data-slug=wp-testing] .deactivate a'.should.be.inDOM
-        }, null, 60000)
+        }, null, 90000)
     })
 })
diff --git a/tests/mocha/test/answers-and-scales-2.js b/tests/mocha/test/answers-and-scales-2.js
@@ -138,7 +138,7 @@ describe('Answers2 and Scales2', function() {
         casper.then(function() {
             this.click('#wpt_question_add');
             this.fillSelectors('form#post', {
-                '#title': 'Test With Answers Sorted',
+                '#title': 'Sorted Answers',
                 '#wpt_question_title_0': 'Question 1',
             })
             this.clickLabel(' No', 'label')
@@ -156,7 +156,7 @@ describe('Answers2 and Scales2', function() {
             })
         })
 
-        casper.waitForUrl(/answers-sorted/, function() {
+        casper.waitForUrl(/sorted-answers/, function() {
             'Fatal'.should.not.be.textInDOM
             'jQuery(".question .answer:first").text().trim()'.should.evaluate.to.be.equal('No')
             this.clickLabel('Edit Test')

diff --git a/tests/mocha/test/answers-variables.js b/tests/mocha/test/answers-variables.js
@@ -10,7 +10,7 @@ describe('Answers variables', function() {
 
     it('should show empty test as under construction initially', function() {
         casper.thenOpen(server + '/wp-admin/edit.php?post_type=wpt_test', function() {
-            this.clickLabel('Test With Answers Sorted', '*[@id="posts-filter"]/*//a')
+            this.clickLabel('Sorted Answers', '*[@id="posts-filter"]/*//a')
         })
 
         casper.waitForUrl(/edit/, function() {

diff --git a/tests/mocha/test/diagrams.js b/tests/mocha/test/diagrams.js
@@ -32,7 +32,7 @@ describe('Diagrams', function() {
             this.clickLabel('Add New', '*[@id="menu-posts-wpt_test"]/*//a')
         })
 
-        casper.then(function() {
+        casper.waitForSelector('#taxonomy-wpt_result .wpt-sortable', function() {
             'Fatal'.should.not.be.textInDOM
             'Add New Test'.should.be.inTitle
 

diff --git a/tests/mocha/test/shortcode.js b/tests/mocha/test/shortcode.js
@@ -151,9 +151,9 @@ describe('Shortcode', function() {
 
     describe('wpt_test_first_page: two tests updates each own`s percentage in title', function() {
         it('should be added',
-            addShortcodeAndCheckResult('[wpt_test_first_page name=eysencks-personality-inventory-epi-extroversionintroversion]\n[wpt_test_first_page name=test-with-answers-sorted]', function() {
+            addShortcodeAndCheckResult('[wpt_test_first_page name=eysencks-personality-inventory-epi-extroversionintroversion]\n[wpt_test_first_page name=sorted-answers]', function() {
             'The Eysenck Personality Inventory (EPI) measures two pervasive'.should.be.textInDOM
-            'Test With Answers Sorted'.should.be.textInDOM
+            'Sorted Answers'.should.be.textInDOM
         }))
 
         it('should not have percentage initially', function() {

diff --git a/tests/mocha/test/z-plugin-deactivation.js b/tests/mocha/test/z-plugin-deactivation.js
@@ -29,16 +29,36 @@ describe('Plugin deactivation', function() {
     })
 
     it('should be deleted', function() {
+        casper.setFilter('page.confirm', function(msg) {
+            return true
+        });
+
        casper.then(function() {
            this.click('#wp-testing .delete a, [data-slug=wp-testing] .delete a')
        })
 
-       casper.waitForUrl(/delete/, function() {
-           this.click('#submit')
-       })
+       var isClickThen = hasDeletedId = false
+       casper.waitFor(function check() {
+           isClickThen = this.evaluate(function() {
+               return document.location.href.indexOf('delete') > -1
+           })
+
+           hasDeletedId = this.evaluate(function() {
+               return document.getElementById('wp-testing-deleted') != null
+           })
+
+           return isClickThen || hasDeletedId
+       }, function then() {
+           isClickThen && this.click('#submit')
+       }, null, 30000)
 
        casper.then(function() {
-           '#wp-testing, [data-slug=wp-testing]'.should.not.be.inDOM
+           if (isClickThen) {
+               '#wp-testing, [data-slug=wp-testing]'.should.not.be.inDOM
+           }
+           if (hasDeletedId) {
+               '#wp-testing-deleted'.should.be.inDOM
+           }
        })
     })
 

diff --git a/tests/mocha/test/z-plugin-upgrade.js b/tests/mocha/test/z-plugin-upgrade.js
@@ -17,14 +17,6 @@ describe('Plugin upgrade', function() {
        })
     })
 
-    it('should activate plugin before update', function() {
-        casper.then(function() {
-            this.clickLabel('Activate')
-        })
-
-        casper.waitForText(/Deactivate/)
-    })
-
     it('should select plugin for update', function() {
         casper.then(function() {
             this.evaluate(function() {
@@ -42,16 +34,12 @@ describe('Plugin upgrade', function() {
             this.click('#doaction')
         })
 
-        casper.waitForUrl(/upgrade/)
+        casper.waitForSelector('.updated-message.notice-success')
     })
 
     it('should update site title through DB', function() {
-        casper.withFrame(0, function() {
-            this.waitForText(/All updates have been completed/, function() {
-                this.thenOpen(server + '/', function() {
-                    'Upgraded from plugin'.should.be.textInDOM
-                })
-            })
+        casper.thenOpen(server + '/', function() {
+            'Upgraded from plugin'.should.be.textInDOM
         })
     })
 })
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.19.1
+ * Version: 0.19.2
  * Author: Alexander Ustimenko
  * Author URI: http://ustimen.co
  * License: GPL3