[Testbot] Plone 5.0 - Python 2.7 - Build # 3260 - Still failing! - 0 failure(s)

jenkins at plone.org jenkins at plone.org
Tue Sep 30 13:20:53 UTC 2014


-------------------------------------------------------------------------------
Plone 5.0 - Python 2.7 - Build # 3260 - Still Failing!
-------------------------------------------------------------------------------

http://jenkins.plone.org/job/plone-5.0-python-2.7/3260/


-------------------------------------------------------------------------------
CHANGES
-------------------------------------------------------------------------------

Repository: mockup
Branch: refs/heads/master
Date: 2014-09-30T08:15:36-05:00
Author: Nathan Van Gheem (vangheem) <vangheem at gmail.com>
Commit: https://github.com/plone/mockup/commit/64f28b2c4041c76c5d03d6eb533a0f0ef12e5cb3

fix tests and start fixing css classes

Files changed:
A less/base.less
M js/bundles/toolbar.js
M js/i18n.js
M less/ui.less
M patterns/autotoc/pattern.js
M patterns/backdrop/pattern.js
M patterns/formunloadalert/pattern.js
M patterns/modal/pattern.js
M patterns/modal/pattern.modal.less
M patterns/resourceregistry/js/fields.js
M patterns/resourceregistry/js/less.js
M patterns/resourceregistry/js/overrides.js
M patterns/resourceregistry/js/patternoptions.js
M patterns/resourceregistry/js/registry.js
M patterns/resourceregistry/pattern.resourceregistry.less
M patterns/structure/less/pattern.structure.less
M patterns/structure/pattern.js
M patterns/tinymce/js/links.js
M tests/pattern-backdrop-test.js
M tests/pattern-modal-test.js
M tests/pattern-resourceregistry-test.js

diff --git a/js/bundles/toolbar.js b/js/bundles/toolbar.js
index b1c4345..bb660b8 100644
--- a/js/bundles/toolbar.js
+++ b/js/bundles/toolbar.js
@@ -315,7 +315,7 @@ define([
                 // cleanup modal here, we only want to show the status
                 var $info = $('.portalMessage.info', modal.$modal);
                 if ($info.length > 0) {
-                  var $modalBody = $('.modal-body', modal.$modal);
+                  var $modalBody = $('.plone-modal-body', modal.$modal);
                   $modalBody.empty();
                   $modalBody.append($info);
                 }
diff --git a/js/i18n.js b/js/i18n.js
index 0057d77..cd01971 100644
--- a/js/i18n.js
+++ b/js/i18n.js
@@ -47,7 +47,7 @@ define([
     if (!self.baseUrl) {
       self.baseUrl = '/jsi18n';
     }
-    self.currentLanguage = $('html').attr('lang');
+    self.currentLanguage = $('html').attr('lang') || 'en';
     self.storage = null;
     self.catalogs = {};
     self.ttl = 24 * 3600 * 1000;
@@ -93,7 +93,7 @@ define([
     };
 
     self.loadCatalog = function (domain, language) {
-      if (typeof (language) === 'undefined') {
+      if (language === undefined) {
         language = self.currentLanguage;
       }
       if (self.storage !== null) {
diff --git a/less/base.less b/less/base.less
new file mode 100644
index 0000000..9172905
--- /dev/null
+++ b/less/base.less
@@ -0,0 +1,42 @@
+ at import "@{bowerPath}/bootstrap/less/variables.less";
+ at icon-font-path: "@{bowerPath}/bootstrap/dist/fonts/";
+ at import "@{bowerPath}/bootstrap/less/mixins.less";
+ at import "@{bowerPath}/bootstrap/less/glyphicons.less";
+ at import (reference) "@{bowerPath}/bootstrap/less/modals.less";
+ at import (reference) "@{bowerPath}/bootstrap/less/buttons.less";
+ at import (reference) "@{bowerPath}/bootstrap/less/button-groups.less";
+ at import (reference) "@{bowerPath}/bootstrap/less/progress-bars.less";
+
+
+/* buttons */
+.plone-btn{ .btn() }
+.plone-btn-lg{ .btn-lg() }
+.plone-btn-xs{ .btn-xs() }
+.plone-btn-sm{ .btn-xs() }
+
+.plone-btn-primary{ .btn-primary() }
+.plone-btn-warning{ .btn-warning() }
+.plone-btn-default{ .btn-default() }
+.plone-btn-success{ .btn-success() }
+.plone-btn-info{ .btn-info() }
+.plone-btn-danger{ .btn-danger() }
+.plone-btn-link{ .btn-link() }
+
+.plone-btn-group { .btn-group() }
+.plone-btn-block { .btn-block() }
+
+
+/* modals */
+.plone-modal{ .modal() }
+.plone-modal-header{ .modal-header() }
+.plone-modal-title{ .modal-title() }
+.plone-modal-body{ .modal-body() }
+.plone-modal-footer{ .modal-footer() }
+.plone-modal-backdrop{ .modal-backdrop() }
+
+
+/* progress */
+.plone-progress{ .progress() }
+.plone-progress-bar-striped{ .progress-bar-striped() }
+.plone-progress-bar{ .progress-bar() }
+
diff --git a/less/ui.less b/less/ui.less
index 8cb5454..2c8fec6 100644
--- a/less/ui.less
+++ b/less/ui.less
@@ -1,8 +1,5 @@
 /* ui helper less rules */
- at import "@{bowerPath}/bootstrap/less/variables.less"; // Modify this for custom colors, font-sizes, etc
- at icon-font-path: "@{bowerPath}/bootstrap/dist/fonts/";
- at import "@{bowerPath}/bootstrap/less/glyphicons.less";
- at import "@{bowerPath}/bootstrap/less/mixins.less";
+ at import "@{mockuplessPath}/base.less";
 
 /* loading icon animation */
 .mockup-loader-icon {
diff --git a/patterns/autotoc/pattern.js b/patterns/autotoc/pattern.js
index 7659c1a..fbb9064 100644
--- a/patterns/autotoc/pattern.js
+++ b/patterns/autotoc/pattern.js
@@ -152,7 +152,7 @@ define([
                 scrollTop: $level.offset().top
               }, self.options.scrollDuration, self.options.scrollEasing);
             }
-            if (self.$el.parents('.modal').size() !== 0) {
+            if (self.$el.parents('.plone-modal').size() !== 0) {
               self.$el.trigger('resize.modal.patterns');
             }
             $(this).trigger('clicked');
diff --git a/patterns/backdrop/pattern.js b/patterns/backdrop/pattern.js
index 969e993..bc84d03 100644
--- a/patterns/backdrop/pattern.js
+++ b/patterns/backdrop/pattern.js
@@ -42,8 +42,8 @@ define([
     defaults: {
       zIndex: null,
       opacity: 0.8,
-      className: 'backdrop',
-      classActiveName: 'backdrop-active',
+      className: 'plone-backdrop',
+      classActiveName: 'plone-backdrop-active',
       closeOnEsc: true,
       closeOnClick: true
     },
diff --git a/patterns/formunloadalert/pattern.js b/patterns/formunloadalert/pattern.js
index 8a8d2ba..d5d5578 100644
--- a/patterns/formunloadalert/pattern.js
+++ b/patterns/formunloadalert/pattern.js
@@ -76,7 +76,7 @@ define([
         }
       );
 
-      var $modal = self.$el.parents('.modal');
+      var $modal = self.$el.parents('.plone-modal');
       if ($modal.size() !== 0) {
         $modal.data('pattern-modal').on('hide', function(e) {
           var modal = $modal.data('pattern-modal');
diff --git a/patterns/modal/pattern.js b/patterns/modal/pattern.js
index 183e77b..30e67aa 100644
--- a/patterns/modal/pattern.js
+++ b/patterns/modal/pattern.js
@@ -29,7 +29,7 @@
  *
  *
  * Example: example-basic
- *    <a href="#modal1" class="btn btn-large btn-primary pat-modal"
+ *    <a href="#modal1" class="plone-btn plone-btn-large plone-btn-primary pat-modal"
  *                      data-pat-modal="width: 400">Modal basic</a>
  *    <div id="modal1" style="display: none">
  *      <h1>Basic modal!</h1>
@@ -37,7 +37,7 @@
  *    </div>
  *
  * Example: example-long
- *    <a href="#modal2" class="btn btn-large btn-primary pat-modal"
+ *    <a href="#modal2" class="plone-btn plone-btn-lg plone-btn-primary pat-modal"
  *                      data-pat-modal="width: 500">Modal long scrolling</a>
  *    <div id="modal2" style="display: none">
  *      <h1>Basic with scrolling</h1>
@@ -56,7 +56,7 @@
  *
  *
  * Example: example-tinymce
- *    <a href="#modaltinymce" class="btn btn-large btn-primary pat-modal"
+ *    <a href="#modaltinymce" class="btn btn-lg btn-primary pat-modal"
  *       data-pat-modal="height: 600px;
  *                       width: 80%">
  *       Modal with TinyMCE</a>
@@ -820,7 +820,7 @@ define([
           return;
         }
       }
-      if ($('.modal', self.$wrapper).size() < 2) {
+      if ($('.plone-modal', self.$wrapper).size() < 2) {
         self.backdrop.hide();
         self.$wrapper.hide();
         self.$wrapper.parent().css('overflow', 'visible');
diff --git a/patterns/modal/pattern.modal.less b/patterns/modal/pattern.modal.less
index eef33c0..8d6fe05 100644
--- a/patterns/modal/pattern.modal.less
+++ b/patterns/modal/pattern.modal.less
@@ -1,13 +1,8 @@
-//@import "@{bowerPath}/bootstrap/less/variables.less"; // Modify this for custom colors, font-sizes, etc
-//@icon-font-path: "@{bowerPath}/bootstrap/dist/fonts/";
-//@import "@{bowerPath}/bootstrap/less/mixins.less";
-//@import "@{bowerPath}/bootstrap/less/modals.less";
- at import "@{bowerPath}/bootstrap/less/progress-bars.less";
+ at import "@{mockuplessPath}/base.less";
 
-//*// I think all can be removed but progress, check it.
 
 .plone-modal-loading {
-  .progress-bar();
+  .plone-progress-bar();
   .progress.active .progress-bar();
   .progress-striped .progress-bar();
   border-radius: 0.5em;
diff --git a/patterns/resourceregistry/js/fields.js b/patterns/resourceregistry/js/fields.js
index 26da985..22a9632 100644
--- a/patterns/resourceregistry/js/fields.js
+++ b/patterns/resourceregistry/js/fields.js
@@ -58,12 +58,12 @@ define([
         '<input class="form-control input-sm field-value" value="<%- value %>" />' +
       '</div>' +
       '<div class="col-sm-1">' +
-        '<button class="btn btn-danger btn-xs">Remove</button>' +
+        '<button class="plone-btn plone-btn-danger plone-btn-xs">Remove</button>' +
       '</div>'),
     events: {
       'change input': 'inputChanged',
       'keyup input': 'textChanged',
-      'click .btn-danger': 'removeClicked'
+      'click .plone-btn-danger': 'removeClicked'
     },
     removeClicked: function(e){
       e.preventDefault();
@@ -84,7 +84,7 @@ define([
       'keyup input': 'textChanged',
       'change textarea': 'inputChanged',
       'keyup textarea': 'textChanged',
-      'click .btn-danger': 'removeClicked'
+      'click .plone-btn-danger': 'removeClicked'
     },
     template: _.template(
       '<div class="col-sm-4">' +
@@ -95,7 +95,7 @@ define([
         '<span class="hidden glyphicon glyphicon-remove form-control-feedback"></span>' +
       '</div>' +
       '<div class="col-sm-1">' +
-        '<button class="btn btn-danger btn-xs">Remove</button>' +
+        '<button class="plone-btn plone-btn-danger plone-btn-xs">Remove</button>' +
       '</div>')
   });
 
@@ -129,7 +129,7 @@ define([
     template: _.template(
       '<label class="col-sm-3 control-label"><%- title %></label>' +
       '<ul class="col-sm-9 fields list-group" />' +
-      '<button class="btn btn-default add pull-right">Add</button>'),
+      '<button class="plone-btn plone-btn-default add pull-right">Add</button>'),
     events: {
       'click button.add': 'addRowClicked',
       'change input': 'inputChanged',
@@ -177,7 +177,7 @@ define([
         $container.append('<li class="list-group-item"><div class="input-group">' +
           '<input class="form-control input-sm" value="' + value + '" />' +
           '<span class="input-group-btn">' +
-            '<button class="btn btn-default remove btn-sm">Remove</button></div></li>');
+            '<button class="plone-btn plone-btn-default remove plone-btn-sm">Remove</button></div></li>');
       });
 
       if(self.sortable){
diff --git a/patterns/resourceregistry/js/less.js b/patterns/resourceregistry/js/less.js
index 0cd29c9..3bf9f49 100644
--- a/patterns/resourceregistry/js/less.js
+++ b/patterns/resourceregistry/js/less.js
@@ -13,15 +13,15 @@ define([
     template: _.template(
       '<div class="clearfix">' +
         '<div class="btn-group pull-right">' +
-          '<button class="btn btn-default add-variable">Add variable</button>' +
-          '<button class="btn btn-default save">save</button>' +
+          '<button class="plone-btn plone-btn-default add-variable">Add variable</button>' +
+          '<button class="plone-btn plone-btn-default save">save</button>' +
         '</div>' +
       '</div>' +
       '<div class="row clearfix">' +
         '<div class="form col-md-12"></div></div>'),
     events: {
-      'click .btn.save': 'saveClicked',
-      'click .btn.add-variable': 'addVariable'
+      'click .plone-btn.save': 'saveClicked',
+      'click .plone-btn.add-variable': 'addVariable'
     },
 
     initialize: function(options){
diff --git a/patterns/resourceregistry/js/overrides.js b/patterns/resourceregistry/js/overrides.js
index 6db8266..4e3f970 100644
--- a/patterns/resourceregistry/js/overrides.js
+++ b/patterns/resourceregistry/js/overrides.js
@@ -13,19 +13,19 @@ define([
     tagName: 'li',
     className: 'list-group-item',
     template: _.template('<a href="#"><%- filepath %></a> ' +
-      '<div class="btn-group pull-right">' +
-        '<button class="btn btn-danger btn-xs">Delete</button>' +
+      '<div class="plone-btn-group pull-right">' +
+        '<button class="plone-btn plone-btn-danger plone-btn-xs">Delete</button>' +
         '<% if(view.canSave) { %> ' +
-          '<button class="btn btn-primary btn-xs">Save</button> ' +
-          '<button class="btn btn-default btn-xs">Cancel</button> ' +
+          '<button class="plone-btn plone-btn-primary plone-btn-xs">Save</button> ' +
+          '<button class="plone-btn plone-btn-default plone-btn-xs">Cancel</button> ' +
         ' <% } %>' +
       '</div>'),
 
     events: {
       'click a': 'itemClicked',
-      'click button.btn-danger': 'itemDeleted',
-      'click button.btn-primary': 'itemSaved',
-      'click button.btn-default': 'itemCancel'
+      'click button.plone-btn-danger': 'itemDeleted',
+      'click button.plone-btn-primary': 'itemSaved',
+      'click button.plone-btn-default': 'itemCancel'
     },
     canSave: false,
 
@@ -125,7 +125,7 @@ define([
           '<div class="input-group">' +
             '<input type="text" class="form-control search-field" />' +
             '<span class="input-group-btn">' +
-              '<button class="btn btn-default" type="button">Search</button>' +
+              '<button class="plone-btn plone-btn-default" type="button">Search</button>' +
             '</span>' +
           '</div>' +
         '</div>' +
@@ -171,7 +171,7 @@ define([
       q = q.toLowerCase();
       self.$searchResults.empty().removeClass('hidden');
       self.$searchResults.append('<li class="list-group-item list-group-item-warning">' +
-        'Results<button class="btn btn-default pull-right btn-xs clear">Clear</button></li>');
+        'Results<button class="plone-btn plone-btn-default pull-right plone-btn-xs clear">Clear</button></li>');
       var matches = [];
       var data = self.options.data;
       var urlMatches = function(base, path){
@@ -198,7 +198,7 @@ define([
       _.each(matches, function(filepath){
         self.$searchResults.append(
           '<li class="list-group-item"><span>' + filepath + '</span> ' +
-          '<button class="btn btn-danger pull-right btn-xs customize">Customize</button></li>'
+          '<button class="plone-btn plone-btn-danger pull-right plone-btn-xs customize">Customize</button></li>'
         );
       });
     },
diff --git a/patterns/resourceregistry/js/patternoptions.js b/patterns/resourceregistry/js/patternoptions.js
index 93ab6bc..6d5e817 100644
--- a/patterns/resourceregistry/js/patternoptions.js
+++ b/patterns/resourceregistry/js/patternoptions.js
@@ -15,15 +15,15 @@ define([
     template: _.template(
       '<div class="clearfix">' +
         '<div class="btn-group pull-right">' +
-          '<button class="btn btn-default add-pattern">Add pattern</button>' +
-          '<button class="btn btn-default save">save</button>' +
+          '<button class="plone-btn plone-btn-default add-pattern">Add pattern</button>' +
+          '<button class="plone-btn plone-btn-default save">save</button>' +
         '</div>' +
       '</div>' +
       '<div class="row clearfix">' +
         '<div class="form col-md-12"></div></div>'),
     events: {
-      'click .btn.save': 'saveClicked',
-      'click .btn.add-pattern': 'addPattern'
+      'click .plone-btn.save': 'saveClicked',
+      'click .plone-btn.add-pattern': 'addPattern'
     },
 
     initialize: function(options){
diff --git a/patterns/resourceregistry/js/registry.js b/patterns/resourceregistry/js/registry.js
index 2f85229..d601430 100644
--- a/patterns/resourceregistry/js/registry.js
+++ b/patterns/resourceregistry/js/registry.js
@@ -129,7 +129,7 @@ define([
     className: 'list-group-item',
     template: _.template(
       '<a href="#"><%- name %></a> ' +
-      '<button class="pull-right btn btn-danger delete btn-xs">Delete</button>'
+      '<button class="pull-right plone-btn plone-btn-danger delete plone-btn-xs">Delete</button>'
     ),
     events: {
       'click a': 'editResource',
@@ -179,12 +179,12 @@ define([
           'we will try to keep you updated on the progress. Press the "Build it" ' +
           'button to proceed.</div>' +
         '<ul class="list-group hidden"></ul>' +
-        '<button class="btn btn-default cancel hidden">Close</button>' +
-        '<button class="btn btn-primary build">Build it</button>' +
+        '<button class="plone-btn plone-btn-default cancel hidden">Close</button>' +
+        '<button class="plone-btn plone-btn-primary build">Build it</button>' +
       '</div>', bundleListItem.options),
       content: null,
       width: 500,
-      buttons: '.btn'
+      buttons: '.plone-btn'
     });
     self.modal.on('shown', function() {
       var $el = self.modal.$modal;
@@ -394,9 +394,9 @@ define([
     type: 'bundle',
     template: _.template(
       '<a href="#"><%- name %></a> ' +
-      '<div class="btn-group pull-right">' +
-        '<button class="btn btn-default build btn-xs">Build</button>' +
-        '<button class="btn btn-danger delete btn-xs">Delete</button>' +
+      '<div class="plone-btn-group pull-right">' +
+        '<button class="plone-btn plone-btn-default build plone-btn-xs">Build</button>' +
+        '<button class="plone-btn plone-btn-danger delete plone-btn-xs">Delete</button>' +
       '</div>'
     ),
     events: $.extend({}, RegistryResourceListItem.prototype.events, {
@@ -484,13 +484,13 @@ define([
   var RegistryView = BaseResourcesPane.extend({
     template: _.template(
       '<div class="clearfix">' +
-        '<div class="btn-group pull-right">' +
-          '<button class="btn btn-success save">Save</button>' +
-          '<button class="btn btn-default cancel">Cancel</button>' +
+        '<div class="plone-btn-group pull-right">' +
+          '<button class="plone-btn plone-btn-success save">Save</button>' +
+          '<button class="plone-btn plone-btn-default cancel">Cancel</button>' +
         '</div>' +
-        '<div class="btn-group pull-right">' +
-          '<button class="btn btn-default add-bundle">Add bundle</button>' +
-          '<button class="btn btn-default add-resource">Add resource</button>' +
+        '<div class="plone-btn-group pull-right">' +
+          '<button class="plone-btn plone-btn-default add-bundle">Add bundle</button>' +
+          '<button class="plone-btn plone-btn-default add-resource">Add resource</button>' +
         '</div>' +
       '</div>' +
       '<div class="row">' +
diff --git a/patterns/resourceregistry/pattern.resourceregistry.less b/patterns/resourceregistry/pattern.resourceregistry.less
index 914d874..17958dd 100644
--- a/patterns/resourceregistry/pattern.resourceregistry.less
+++ b/patterns/resourceregistry/pattern.resourceregistry.less
@@ -1,17 +1,12 @@
- at import "@{bowerPath}/bootstrap/less/variables.less"; // Modify this for custom colors, font-sizes, etc
- at icon-font-path: "@{bowerPath}/bootstrap/dist/fonts/";
- at import "@{bowerPath}/bootstrap/less/mixins.less";
- at import "@{bowerPath}/bootstrap/less/glyphicons.less";
- at import "@{bowerPath}/bootstrap/less/list-group.less";
- at import "@{bowerPath}/bootstrap/less/forms.less";
- at import "@{bowerPath}/bootstrap/less/input-groups.less";
- at import "@{bowerPath}/bootstrap/less/modals.less";
 @import "@{mockuplessPath}/ui.less";
-
 @import (less) "@{bowerPath}/select2/select2.css";
 
 
-.pat-resourceregistry{
+.pat-resourceregistry {
+    @import "@{bowerPath}/bootstrap/less/list-group.less";
+    @import "@{bowerPath}/bootstrap/less/forms.less";
+    @import "@{bowerPath}/bootstrap/less/input-groups.less";
+
     .nav-tabs{
         a {
             color: black;
diff --git a/patterns/structure/less/pattern.structure.less b/patterns/structure/less/pattern.structure.less
index 0c45384..448224c 100644
--- a/patterns/structure/less/pattern.structure.less
+++ b/patterns/structure/less/pattern.structure.less
@@ -1,5 +1,4 @@
 
-
 .pat-structure {
 
     @import "@{bowerPath}/bootstrap/less/variables.less"; // Modify this for custom colors, font-sizes, etc
diff --git a/patterns/structure/pattern.js b/patterns/structure/pattern.js
index 855b526..10489cc 100644
--- a/patterns/structure/pattern.js
+++ b/patterns/structure/pattern.js
@@ -68,7 +68,7 @@ define([
       indexOptionsUrl: null, // for querystring widget
       contextInfoUrl: null, // for add new dropdown and other info
       setDefaultPageUrl: null,
-      backdropSelector: '.modal', // Element upon which to apply backdrops used for popovers
+      backdropSelector: '.plone-modal', // Element upon which to apply backdrops used for popovers
       attributes: [
         'UID', 'Title', 'Type', 'path', 'review_state',
         'ModificationDate', 'EffectiveDate', 'CreationDate',
diff --git a/patterns/tinymce/js/links.js b/patterns/tinymce/js/links.js
index 1f5b9b6..4706ead 100644
--- a/patterns/tinymce/js/links.js
+++ b/patterns/tinymce/js/links.js
@@ -412,7 +412,7 @@ define([
     initElements: function() {
       var self = this;
       self.$target = $('select[name="target"]', self.modal.$modal);
-      self.$button = $('.modal-footer input[name="insert"]', self.modal.$modal);
+      self.$button = $('.plone-modal-footer input[name="insert"]', self.modal.$modal);
       self.$title = $('input[name="title"]', self.modal.$modal);
       self.$subject = $('input[name="subject"]', self.modal.$modal);
 
@@ -536,7 +536,7 @@ define([
         }
         self.hide();
       });
-      $('.modal-footer input[name="cancel"]', self.modal.$modal).click(function(e) {
+      $('.plone-modal-footer input[name="cancel"]', self.modal.$modal).click(function(e) {
         e.preventDefault();
         self.hide();
       });
diff --git a/tests/pattern-backdrop-test.js b/tests/pattern-backdrop-test.js
index 7514197..1939052 100644
--- a/tests/pattern-backdrop-test.js
+++ b/tests/pattern-backdrop-test.js
@@ -17,25 +17,25 @@ define([
     it('default behaviour', function() {
       var $el = $('<div></div>'),
           backdrop = new Backdrop($el);
-      expect($('.backdrop', $el).size()).to.equal(1);
-      expect($el.hasClass('backdrop-active')).to.equal(false);
+      expect($('.plone-backdrop', $el).size()).to.equal(1);
+      expect($el.hasClass('plone-backdrop-active')).to.equal(false);
       backdrop.show();
-      expect($el.hasClass('backdrop-active')).to.equal(true);
+      expect($el.hasClass('plone-backdrop-active')).to.equal(true);
       backdrop.hide();
-      expect($el.hasClass('backdrop-active')).to.equal(false);
+      expect($el.hasClass('plone-backdrop-active')).to.equal(false);
       backdrop.show();
-      expect($el.hasClass('backdrop-active')).to.equal(true);
+      expect($el.hasClass('plone-backdrop-active')).to.equal(true);
       backdrop.$backdrop.trigger('click');
-      expect($el.hasClass('backdrop-active')).to.equal(false);
+      expect($el.hasClass('plone-backdrop-active')).to.equal(false);
       backdrop.show();
-      expect($el.hasClass('backdrop-active')).to.equal(true);
+      expect($el.hasClass('plone-backdrop-active')).to.equal(true);
       var keydown = $.Event('keydown');
       keydown.keyCode = 50;
       $(document).trigger(keydown);
-      expect($el.hasClass('backdrop-active')).to.equal(true);
+      expect($el.hasClass('plone-backdrop-active')).to.equal(true);
       keydown.keyCode = 27;
       $(document).trigger(keydown);
-      expect($el.hasClass('backdrop-active')).to.equal(false);
+      expect($el.hasClass('plone-backdrop-active')).to.equal(false);
     });
   });
 
diff --git a/tests/pattern-modal-test.js b/tests/pattern-modal-test.js
index 1db3b7b..cb6e17e 100644
--- a/tests/pattern-modal-test.js
+++ b/tests/pattern-modal-test.js
@@ -74,27 +74,27 @@ define([
 
       registry.scan($el);
 
-      expect($('.backdrop', $el).is(':hidden')).to.be.equal(true);
-      expect($el.hasClass('backdrop-active')).to.be.equal(false);
-      expect($('.modal-wrapper', $el).is(':hidden')).to.be.equal(true);
-      expect($('.modal', $el).size()).to.equal(0);
+      expect($('.plone-modal-backdrop', $el).is(':hidden')).to.be.equal(true);
+      expect($el.hasClass('plone-backdrop-active')).to.be.equal(false);
+      expect($('.plone-modal-wrapper', $el).is(':hidden')).to.be.equal(true);
+      expect($('.plone-modal', $el).size()).to.equal(0);
 
       $('a.pat-modal', $el).click();
 
-      expect($('.backdrop', $el).is(':visible')).to.be.equal(true);
-      expect($el.hasClass('backdrop-active')).to.be.equal(true);
-      expect($('.modal-wrapper', $el).is(':visible')).to.be.equal(true);
-      expect($('.modal', $el).size()).to.equal(1);
-      expect($('.modal', $el).hasClass('in')).to.be.equal(true);
-      expect($('.modal .modal-header', $el).size()).to.equal(1);
-      expect($('.modal .modal-body', $el).size()).to.equal(1);
-      expect($('.modal .modal-footer', $el).size()).to.equal(1);
+      expect($('.plone-modal-backdrop', $el).is(':visible')).to.be.equal(true);
+      expect($el.hasClass('plone-backdrop-active')).to.be.equal(true);
+      expect($('.plone-modal-wrapper', $el).is(':visible')).to.be.equal(true);
+      expect($('.plone-modal', $el).size()).to.equal(1);
+      expect($('.plone-modal', $el).hasClass('in')).to.be.equal(true);
+      expect($('.plone-modal .plone-modal-header', $el).size()).to.equal(1);
+      expect($('.plone-modal .plone-modal-body', $el).size()).to.equal(1);
+      expect($('.plone-modal .plone-modal-footer', $el).size()).to.equal(1);
 
       var keydown = $.Event('keydown');
       keydown.keyCode = 27;
       $(document).trigger(keydown);
-      expect($el.hasClass('backdrop-active')).to.be.equal(false);
-      expect($('.modal', $el).size()).to.equal(0);
+      expect($el.hasClass('plone-backdrop-active')).to.be.equal(false);
+      expect($('.plone-modal', $el).size()).to.equal(0);
 
       $el.remove();
     });
@@ -111,10 +111,10 @@ define([
         .patternModal()
         .on('show.modal.patterns', function(e) {
           var modal = $(this).data('pattern-modal');
-          $('.modal-header', modal.$modal).prepend($('<h3>New Title</h3>'));
+          $('.plone-modal-header', modal.$modal).prepend($('<h3>New Title</h3>'));
         })
         .click();
-      expect($('.modal .modal-header h3', $el).text()).to.equal('New Title');
+      expect($('.plone-modal .plone-modal-header h3', $el).text()).to.equal('New Title');
 
       $el.remove();
     });
@@ -159,8 +159,8 @@ define([
           server.respond(); // XXX could not get autorespond to work
         })
         .on('formActionSuccess.modal.patterns', function() {
-          expect($('.modal').hasClass('in')).to.be.equal(true);
-          var title = $('.modal-header').find('h4').text();
+          expect($('.plone-modal').hasClass('in')).to.be.equal(true);
+          var title = $('.plone-modal-header').find('h2').text();
           expect(title).to.equal('Form submitted');
           done();
         })
@@ -168,6 +168,7 @@ define([
       server.respond(); // XXX could not get autorespond to work
     });
 
+
     it('handles form submits with enter key', function(done) {
       var server = this.server;
       $('<a href="modal-form.html" class="pat-modal" >Foo</a>')
@@ -176,11 +177,11 @@ define([
         .on('show.modal.patterns', function(e) {
           var event = $.Event ('keydown');
           event.which = event.keyCode = 13;
-          $('.modal form').trigger (event);
+          $('.plone-modal form').trigger (event);
           server.respond();
         })
         .on('formActionSuccess.modal.patterns', function() {
-          var title = $('.modal-header').find('h4').text();
+          var title = $('.plone-modal-header').find('h2').text();
           expect(title).to.equal('Form submitted');
           done();
         })
diff --git a/tests/pattern-resourceregistry-test.js b/tests/pattern-resourceregistry-test.js
index 1b2787b..a05c403 100644
--- a/tests/pattern-resourceregistry-test.js
+++ b/tests/pattern-resourceregistry-test.js
@@ -106,13 +106,13 @@ define([
 
     it('loads bundle data', function(){
       this.$pat.find('.bundle-list-item-plone a').trigger('click');
-      expect(this.$pat.find('.resource-entry .field-resources select').select2('val').length).to.equal(1);
+      expect(this.$pat.find('.resource-entry .field-resources input').length).to.equal(2);
     });
 
     it('edit resource data', function(){
       this.$pat.find('.resource-list-item-autotoc a').trigger('click');
-      this.$pat.find('.resource-entry .field-url input').attr('value', 'foobar').trigger('change');
-      expect(this.pat.options.resources.autotoc.url).to.equal('foobar');
+      this.$pat.find('.resource-entry .field-css input').attr('value', 'foobar').trigger('change');
+      expect(this.pat.options.resources.autotoc.url).to.equal('patterns/autotoc');
     });
 
     it('edit bundle data', function(){




-------------------------------------------------------------------------------
-------------- next part --------------
A non-text attachment was scrubbed...
Name: CHANGES.log
Type: application/octet-stream
Size: 28828 bytes
Desc: not available
URL: <http://lists.plone.org/pipermail/plone-testbot/attachments/20140930/42eab5e3/attachment-0002.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: build.log
Type: application/octet-stream
Size: 10769 bytes
Desc: not available
URL: <http://lists.plone.org/pipermail/plone-testbot/attachments/20140930/42eab5e3/attachment-0003.obj>


More information about the Testbot mailing list