mockup/contextual-menu: Merge pull request #791 from plone/datakurre-contextual-menu

Repository: mockup
Branch: refs/heads/contextual-menu
Date: 2017-08-01T11:24:47-05:00
Author: Oshane Bailey (b4oshany) <[email protected]>
Commit: https://github.com/plone/mockup/commit/f4439c184daf1b9baea52b4c650c96055c6e42b2

Merge pull request #791 from plone/datakurre-contextual-menu

Fix tests for context-menu branch

Files changed:
M .travis.yml
M mockup/patterns/filemanager/pattern.js
M mockup/tests/pattern-filemanager-test.js
M mockup/tests/pattern-thememapper-test.js

diff --git a/.travis.yml b/.travis.yml
index ee0cc148..6a9f34fb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,6 +37,6 @@ matrix:
     - env: BROWSERS="SL_IPhone"
     - env: BROWSERS="SL_IPad"
     - env: BROWSERS="SL_Android"
-branches:
-  only:
-    - master
+#branches:
+#  only:
+#    - master
diff --git a/mockup/patterns/filemanager/pattern.js b/mockup/patterns/filemanager/pattern.js
index 58fd9b47..b1c335ae 100644
--- a/mockup/patterns/filemanager/pattern.js
+++ b/mockup/patterns/filemanager/pattern.js
@@ -300,8 +300,6 @@ define([
         views["edit_menu"].push(customizeView);
         edit_menu.items.push(customizeView.triggerView);
       }
-      console.log(mainButtons);
-      console.log(views);
       self.views = [];
       self.views = self.views.concat(views.file_menu).concat(views.edit_menu).concat(views.find_menu);
 
diff --git a/mockup/tests/pattern-filemanager-test.js b/mockup/tests/pattern-filemanager-test.js
index 8f3577d3..ee5d3ded 100644
--- a/mockup/tests/pattern-filemanager-test.js
+++ b/mockup/tests/pattern-filemanager-test.js
@@ -40,7 +40,8 @@ define([
       registry.scan(this.$el);
       this.clock.tick(1000);
       expect(this.$el.find('.tree ul').length).to.be.equal(2);
-      expect($('#contextual-menu li').length).to.be.equal(4);
+      // New File, New Folder, Rename, Delete, Upload Here
+      expect($('#contextual-menu li').length).to.be.equal(5);
     });
   });
 
diff --git a/mockup/tests/pattern-thememapper-test.js b/mockup/tests/pattern-thememapper-test.js
index 78576912..f7362f7c 100644
--- a/mockup/tests/pattern-thememapper-test.js
+++ b/mockup/tests/pattern-thememapper-test.js
@@ -39,7 +39,9 @@ define([
       expect($('.pat-filemanager', this.$el).length > 0).to.be.equal(true);
       expect($('#btngroup-mapper', this.$el).length > 0).to.be.equal(true);
       expect($('#btn-showinspectors', this.$el).length > 0).to.be.equal(true);
-      expect($('#btn-buildrule', this.$el).length > 0).to.be.equal(true);
+      expect($('#dropdown-menu-', this.$el).length > 0).to.be.equal(true);
+      expect($('.btn-group-dropdown #alink-buildrule', this.$el).length > 0).to.be.equal(true);
+      expect($('.btn-group-dropdown #alink-buildless', this.$el).length > 0).to.be.equal(true);
       expect($('#btn-previewtheme', this.$el).length > 0).to.be.equal(true);
       expect($('#btn-fullscreenEditor', this.$el).length > 0).to.be.equal(true);
       expect($('#btn-helpbutton', this.$el).length > 0).to.be.equal(true);



------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot