From 19fcb471c512dd14ffdccda70924adb890af9bbe Mon Sep 17 00:00:00 2001
From: Christian Vuerings <vueringschristian@gmail.com>
Date: Wed, 6 Jun 2012 09:55:58 -0700
Subject: [PATCH] SAKIII-5723 - Fix Widget Configuration Test Suite
 https://jira.sakaiproject.org/browse/SAKIII-5723

---
 devwidgets/embedcontent/config.json               |  2 +-
 .../embedcontent/javascript/embedcontent.js       |  4 ++--
 devwidgets/pagetitle/config.json                  |  4 +++-
 tests/qunit/js/devwidgets.js                      |  1 -
 tests/qunit/tests/unit/js/widgets.js              | 15 ---------------
 5 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/devwidgets/embedcontent/config.json b/devwidgets/embedcontent/config.json
index 158380af8d2..9e8fa4d239a 100644
--- a/devwidgets/embedcontent/config.json
+++ b/devwidgets/embedcontent/config.json
@@ -1,5 +1,5 @@
 {
-    "defaultOptions": {
+    "defaultConfiguration": {
         "embedmethod": "original",
         "layout": "vertical",
         "showDetails": false,
diff --git a/devwidgets/embedcontent/javascript/embedcontent.js b/devwidgets/embedcontent/javascript/embedcontent.js
index a2fe83ff387..80c04081cdc 100644
--- a/devwidgets/embedcontent/javascript/embedcontent.js
+++ b/devwidgets/embedcontent/javascript/embedcontent.js
@@ -546,8 +546,8 @@ require(["jquery", "sakai/sakai.api.core"], function($, sakai) {
             } else {
                 toggleTabs(e.target);
             }
-            if (tab === 'display' && !defaultsSet && !wData && sakai.widgets.embedcontent.defaultOptions) {
-                setDefaultOptions(sakai.widgets.embedcontent.defaultOptions);
+            if (tab === 'display' && !defaultsSet && !wData && sakai.widgets.embedcontent.defaultConfiguration) {
+                setDefaultOptions(sakai.widgets.embedcontent.defaultConfiguration);
                 defaultsSet = true;
             }
             return false;
diff --git a/devwidgets/pagetitle/config.json b/devwidgets/pagetitle/config.json
index 301f8d3b448..dd7a5c2a7cb 100644
--- a/devwidgets/pagetitle/config.json
+++ b/devwidgets/pagetitle/config.json
@@ -8,8 +8,10 @@
             "name": "Page Title"
         }
     },
+    "id": "pagetitle",
     "indexFields": ["content"],
     "personalportal": false,
     "sakaidocs": false,
-    "url": "/devwidgets/pagetitle/pagetitle.html"
+    "url": "/devwidgets/pagetitle/pagetitle.html",
+    "type": "sakai"
 }
\ No newline at end of file
diff --git a/tests/qunit/js/devwidgets.js b/tests/qunit/js/devwidgets.js
index db9e8cb74d9..4db65a609f8 100644
--- a/tests/qunit/js/devwidgets.js
+++ b/tests/qunit/js/devwidgets.js
@@ -77,7 +77,6 @@ require(["jquery", "sakai/sakai.api.core"], function($, sakai){
         "joinrequestbuttons",
         "joinrequests",
         "lhnavigation",
-        "login",
         "mycontacts",
         "mycontent",
         "mygroups",
diff --git a/tests/qunit/tests/unit/js/widgets.js b/tests/qunit/tests/unit/js/widgets.js
index 264db5dbb48..a5e13977628 100644
--- a/tests/qunit/tests/unit/js/widgets.js
+++ b/tests/qunit/tests/unit/js/widgets.js
@@ -10,9 +10,6 @@ require(
     function($, sakai) {
 
         var widgetProperties = [{
-            "name": "ca",
-            "type": "boolean"
-        }, {
             "name": "hasSettings",
             "type": "boolean"
         }, {
@@ -50,18 +47,6 @@ require(
             "name": "url",
             "required": true,
             "type": "string"
-        }, {
-            "name": "groupdashboard",
-            "type": "boolean"
-        }, {
-            "name": "grouppages",
-            "type": "boolean"
-        }, {
-            "name": "userdashboard",
-            "type": "boolean"
-        }, {
-            "name": "userpages",
-            "type": "boolean"
         }, {
             "name": "deletable",
             "type": "boolean"