Merge branch 'release/0.17.2'

garex · Nov 14, 2015 · b4fe5b0 · b4fe5b0
2 parents 8dd351c + 302d289
commit b4fe5b0
Show file tree

Hide file tree

Showing 146 changed files with 6,537 additions and 1,826 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,21 +1,34 @@
+/composer.lock
 /db/log/*.log
 /db/ruckusing.conf.local.php
 /db/sql/*.bak
-/composer.lock
 /js/vendor/evercookie
 /js/vendor/uuid-js
 /phpunit.xml
-/tests/mocha/node_modules/
-/tests/integration-environment/cache/*.*
-/tests/integration-environment/wordpress/
-/tests/integration-environment/wordpress-*.tar.gz
-/tests/integration-environment/*.zip
 /tests/integration-environment/*.log
 /tests/integration-environment/*.pid
+/tests/integration-environment/*.zip
+/tests/integration-environment/cache/*.*
+/tests/integration-environment/wordpress-*.tar.gz
+/tests/integration-environment/wordpress/
+/tests/mocha/node_modules/
+/tools/intro-video/*.mp4
+/tools/intro-video/.backup/
+/tools/intro-video/Wp-testing-Intro.mp4.txt
+/tools/intro-video/aifc/
+/tools/intro-video/background/
+/tools/intro-video/mkv/
+/tools/intro-video/mp3/
+/tools/intro-video/node_modules/
+/tools/intro-video/ogv/
+/tools/intro-video/thumbnail/
+/tools/intro-video/thumbs/
+/tools/refactoring/*.sql
+/tools/refactoring/*.svg
+/tools/screenshots/decorated/*.png
 /tools/screenshots/node_modules/
 /tools/screenshots/raw/*.png
-/tools/screenshots/decorated/*.png
-/tools/support/*.txt
 /tools/support/*.md
+/tools/support/*.txt
 /tools/support/wordpress-support-mirror/
 /vendor/
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,18 @@
 ## Changelog ##
 
 
+### 0.17.2 ###
+
+Internal improvements and intro-video
+
+Add intro-video with plugin description, howto concepts and explanations: http://www.youtube.com/watch?v=tT3d8Jdm7kY
+
+Internal improvements:
+
+* Improve code quality and avoid duplicates
+* Improve test rendering
+
+
 ### 0.17.1 ###
 
 Fix incorrect content processing

diff --git a/README.md b/README.md
diff --git a/composer.json b/composer.json
@@ -39,6 +39,7 @@
     },
     "autoload": {
         "classmap": [
+            "db/migrations/wp_testing/",
             "src/",
             "vendor/yahnis-elsts/plugin-update-checker/plugin-update-checker.php"
         ]
@@ -131,10 +132,10 @@
                 "source": {
                     "url": "https://github.com/garex/flourish-classes",
                     "type": "git",
-                    "reference": "85ef4360f05787f3455ec2d3293194b58f10d132"
+                    "reference": "0a5b2536d9736b6fe12d8ab1b8f9ad341d2397bf"
                 },
                 "dist": {
-                    "url": "https://github.com/garex/flourish-classes/archive/85ef4360f05787f3455ec2d3293194b58f10d132.zip",
+                    "url": "https://github.com/garex/flourish-classes/archive/0a5b2536d9736b6fe12d8ab1b8f9ad341d2397bf.zip",
                     "type": "zip"
                 }
             }

diff --git a/...wp_testing/20140901000000_AddWpTables.php → ...00000_WpTesting_Migration_AddWpTables.php b/...wp_testing/20140901000000_AddWpTables.php → ...00000_WpTesting_Migration_AddWpTables.php
@@ -1,16 +1,14 @@
 <?php
 
-require_once dirname(__FILE__) . DIRECTORY_SEPARATOR . '_BaseMigration.php';
-
 /**
  * Required mostly for quick unit testing
  */
-class AddWpTables extends BaseMigration
+class WpTesting_Migration_AddWpTables extends WpTesting_Migration_Base
 {
     public function up()
     {
         $this->execute('
-            CREATE TABLE IF NOT EXISTS ' . WP_DB_PREFIX . 'posts (
+            CREATE TABLE IF NOT EXISTS ' . $this->globalPrefix . 'posts (
               ID bigint(20) unsigned NOT NULL AUTO_INCREMENT,
               post_author bigint(20) unsigned NOT NULL DEFAULT "0",
               post_date datetime NOT NULL DEFAULT "0000-00-00 00:00:00",
@@ -42,7 +40,7 @@ public function up()
             ) DEFAULT CHARSET=utf8
         ');
         $this->execute('
-            CREATE TABLE IF NOT EXISTS ' . WP_DB_PREFIX . 'terms (
+            CREATE TABLE IF NOT EXISTS ' . $this->globalPrefix . 'terms (
               term_id bigint(20) unsigned NOT NULL AUTO_INCREMENT,
               name varchar(200) NOT NULL DEFAULT "",
               slug varchar(200) NOT NULL DEFAULT "",
@@ -53,7 +51,7 @@ public function up()
             ) DEFAULT CHARSET=utf8
         ');
         $this->execute('
-            CREATE TABLE IF NOT EXISTS ' . WP_DB_PREFIX . 'users (
+            CREATE TABLE IF NOT EXISTS ' . $this->globalPrefix . 'users (
               ID bigint(20) unsigned NOT NULL AUTO_INCREMENT,
               user_login varchar(60) NOT NULL DEFAULT "",
               user_pass varchar(64) NOT NULL DEFAULT "",
@@ -71,7 +69,7 @@ public function up()
         ');
 
         $this->execute('
-            CREATE TABLE IF NOT EXISTS ' . WP_DB_PREFIX . 'term_taxonomy (
+            CREATE TABLE IF NOT EXISTS ' . $this->globalPrefix . 'term_taxonomy (
               term_taxonomy_id bigint(20) unsigned NOT NULL AUTO_INCREMENT,
               term_id bigint(20) unsigned NOT NULL DEFAULT "0",
               taxonomy varchar(32) NOT NULL DEFAULT "",
@@ -84,7 +82,7 @@ public function up()
             ) DEFAULT CHARSET=utf8
         ');
         $this->execute('
-            CREATE TABLE IF NOT EXISTS ' . WP_DB_PREFIX . 'term_relationships (
+            CREATE TABLE IF NOT EXISTS ' . $this->globalPrefix . 'term_relationships (
               object_id bigint(20) unsigned NOT NULL DEFAULT "0",
               term_taxonomy_id bigint(20) unsigned NOT NULL DEFAULT "0",
               term_order int(11) NOT NULL DEFAULT "0",
@@ -93,7 +91,7 @@ public function up()
             ) DEFAULT CHARSET=utf8
         ');
         $this->execute('
-            CREATE TABLE IF NOT EXISTS ' . WP_DB_PREFIX . 'postmeta (
+            CREATE TABLE IF NOT EXISTS ' . $this->globalPrefix . 'postmeta (
                 meta_id bigint(20) unsigned NOT NULL AUTO_INCREMENT,
                 post_id bigint(20) unsigned NOT NULL DEFAULT "0",
                 meta_key varchar(255) DEFAULT NULL,

diff --git a/db/migrations/wp_testing/20140913082248_AddQuestionsTable.php b/db/migrations/wp_testing/20140913082248_AddQuestionsTable.php
diff --git a/db/migrations/wp_testing/20140913082248_WpTesting_Migration_AddQuestionsTable.php b/db/migrations/wp_testing/20140913082248_WpTesting_Migration_AddQuestionsTable.php
@@ -0,0 +1,13 @@
+<?php
+
+class WpTesting_Migration_AddQuestionsTable extends WpTesting_Migration_AddSingleTable
+{
+
+    protected $entity = 'question';
+
+    protected function setUpTable($table)
+    {
+        $this->addForeignKeyToTest($table);
+        $table->addColumnText('question_title');
+    }
+}
diff --git a/db/migrations/wp_testing/20140916030608_AddTestScoresTable.php b/db/migrations/wp_testing/20140916030608_AddTestScoresTable.php
diff --git a/db/migrations/wp_testing/20140916030608_WpTesting_Migration_AddTestScoresTable.php b/db/migrations/wp_testing/20140916030608_WpTesting_Migration_AddTestScoresTable.php
@@ -0,0 +1,33 @@
+<?php
+
+class WpTesting_Migration_AddTestScoresTable extends WpTesting_Migration_MigrateTable
+{
+    public function up()
+    {
+        $this->createTable('scores')
+            ->addForeignKey('answer_id', array(
+                'primary_key'     => true,
+                'keyName'         => 'fk_score_answer',
+                'referencedTable' => "{$this->globalPrefix}terms",
+                'referencedKey'   => 'term_id',
+            ))
+            ->addForeignKey('question_id', array(
+                'primary_key'     => true,
+                'keyName'         => 'fk_score_question',
+                'referencedTable' => "{$this->pluginPrefix}questions",
+            ))
+            ->addForeignKey('scale_id', array(
+                'primary_key'     => true,
+                'keyName'         => 'fk_score_scale',
+                'referencedTable' => "{$this->globalPrefix}terms",
+                'referencedKey'   => 'term_id',
+            ))
+            ->addColumnIntegerTiny('score_value', array('default' => 0))
+            ->finish();
+    }
+
+    public function down()
+    {
+        $this->dropTable('scores');
+    }
+}