Merge branch 'hotfix/0.13.1'

CHANGELOG.md

@@ -2,6 +2,13 @@
 ## Changelog ##
 
 
+### 0.13.1 ###
+
+Fix result permalinks with front prefixes
+
+* Make permalinks like /archives/%post_id% work for both tests and results
+
+
 ### 0.13 ###
 
 Respondent passings for user and admin with improved usability   

README.md

@@ -5,7 +5,7 @@
 **Tags:** psychological, testing, test, quiz  
 **Requires at least:** 3.2  
 **Tested up to:** 4.2.2  
-**Stable tag:** 0.13  
+**Stable tag:** 0.13.1  
 **License:** GPLv3  
 **License URI:** http://www.gnu.org/licenses/gpl-3.0.html  
 

src/Doer/WordPressEntitiesRegistrator.php

@@ -150,8 +150,13 @@ public function __construct(WpTesting_WordPressFacade $wp)
 
         $this->wp->getWP()->add_query_var('wpt_passing_slug');
         $rewrite = $this->wp->getRewrite();
+        $prefix  = implode('/', array_filter(array(
+        		trim($rewrite->root,  '/'),
+        		trim($rewrite->front, '/'),
+        		$testSlug,
+        )));
         $rewrite->add_rule(
-            $rewrite->root . $testSlug . '/([^/]+)/([a-z0-9]+[a-f0-9]{32})/?$',
+            $prefix . '/([^/]+)/([a-z0-9]+[a-f0-9]{32})/?$',
             $rewrite->index . '?wpt_test=$matches[1]&wpt_passing_slug=$matches[2]',
             'top'
         );

tests/mocha/start.sh

@@ -19,4 +19,4 @@ export TZ="UTC"
 rm -f /tmp/cookies.*.txt
 
 # Run tests
-mocha-casperjs --grep=Plugin_deactivation --invert --timeout=360000
+mocha-casperjs --grep=deactivation --invert --timeout=360000

tests/mocha/test/0-plugin.js

@@ -1,4 +1,4 @@
-describe('Plugin_activation', function() {
+describe('Plugin activation', function() {
 
     before(function () {
         require('../login-as').admin(this)

tests/mocha/test/scale-aggregates.js

@@ -1,4 +1,4 @@
-describe('Scale_Aggregates', function() {
+describe('Scale aggregates', function() {
 
     before(function () {
         require('../login-as').admin(this)

tests/mocha/test/y-passing.js

@@ -1,20 +1,18 @@
-function wptDescribePassings(isPermalinks) {
-var isUnderUser = isPermalinks
-describe('Passings' + (isPermalinks ? ' with permalinks' : '')
-                    + (isUnderUser ? ' under user' : ''), function() {
+function wptSetupPermalinks(structure) {
+    var structureLabel = (structure == '') ? 'default' : structure
 
     before(function () {
         require('../login-as').admin(this, true)
     })
 
-    it('should setup permalinks', function() {
+    it('should setup permalinks to ' + structureLabel, function() {
         casper.thenOpen('http://wpti.dev/wp-admin/options-permalink.php')
 
         casper.waitForUrl(/options/).then(function() {
             'Permalink Settings'.should.be.textInDOM
-            if (isPermalinks) {
+            if (structure !== '') {
                 this.click('#permalink_structure')
-                this.sendKeys('#permalink_structure', '/%postname%/');
+                this.sendKeys('#permalink_structure', structure);
             } else {
                 this.clickLabel(' Default', 'label')
             }
@@ -30,6 +28,14 @@ describe('Passings' + (isPermalinks ? ' with permalinks' : '')
 
         require('../login-as').adminLogout()
     })
+}
+
+function wptDescribePassings(isPermalinks) {
+var isUnderUser = isPermalinks
+describe((isPermalinks ? 'With'       : 'Without') + ' permalinks '
+       + (isUnderUser  ? 'under user' : 'as anonymous'), function() {
+
+    wptSetupPermalinks(isPermalinks ? '/%postname%/' : '')
 
     if (isUnderUser) {
     it('should login under user', function() {
@@ -293,5 +299,33 @@ describe('Passings' + (isPermalinks ? ' with permalinks' : '')
 })
 }
 
-wptDescribePassings(false);
-wptDescribePassings(true);
+describe('Passings', function() {
+    describe('With numerical permalinks', function() {
+        wptSetupPermalinks('/archives/%post_id%')
+
+        it('should pass test', function() {
+            casper.open('http://wpti.dev/')
+
+            casper.then(function() {
+                this.clickLabel('Are You Hot or Not?!')
+            })
+
+            casper.waitForUrl(/test/, function() {
+                this.clickLabel('Yes', '*[@id="wpt-test-form"]/*[1]/*//label')
+                this.fill('form#wpt-test-form', {}, true)
+            })
+        })
+
+        it('should show result page', function() {
+            casper.waitForUrl(/test.+[a-z0-9]+[a-f0-9]{32}/, function() {
+                'Fatal'.should.not.be.textInDOM
+                'Results'.should.be.textInDOM
+                'Allow others to rate the vacuum on the Earth'.should.not.be.textInDOM
+                this.getTitle().should.not.match(/^Page not found/)
+            })
+        })
+    })
+
+    wptDescribePassings(false)
+    wptDescribePassings(true)
+})

tests/mocha/test/y-respondents-results.js

@@ -59,7 +59,7 @@ describe('Filtering', function() {
         })
 
         casper.waitForUrl(/filter_condition[^=]+test_id[^=]+=\d+/, function() {
-            '2 items'.should.be.textInDOM
+            '3 items'.should.be.textInDOM
             expect('#the-list').to.contain.text('Are You Hot or Not?!')
             expect('#the-list').to.not.contain.text('Test Containing Results')
         })
@@ -73,7 +73,7 @@ describe('Filtering', function() {
         })
 
         casper.waitForUrl(/filter_condition[^=]+user[^=]+=[^&]/, function() {
-            '1 item'.should.be.textInDOM
+            '2 items'.should.be.textInDOM
             expect('#the-list').to.not.contain.text('user')
         })
     })

tests/mocha/test/z-plugin.js

@@ -1,4 +1,4 @@
-describe('Plugin_deactivation', function() {
+describe('Plugin deactivation', function() {
 
     before(function () {
         require('../login-as').admin(this)

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.13
+ * Version: 0.13.1
  * Author: Alexander Ustimenko
  * Author URI: http://ustimen.co
  * License: GPL3