From f72a70c5597f8b6b20724c0043fec03adcb1f117 Mon Sep 17 00:00:00 2001
From: Xavier Guimard <xavier.guimard@laposte.net>
Date: Thu, 16 Mar 2017 12:06:55 +0000
Subject: [PATCH] add Diff test in e2e_test (#575)

---
 Makefile                                     |  2 +-
 e2e-tests/manager/36-diff.js                 | 20 ++++++++++++++++++++
 lemonldap-ng-manager/site/templates/diff.tpl | 14 +++++++-------
 3 files changed, 28 insertions(+), 8 deletions(-)
 create mode 100644 e2e-tests/manager/36-diff.js

diff --git a/Makefile b/Makefile
index 732e27ec7..ab72c1ce1 100644
--- a/Makefile
+++ b/Makefile
@@ -454,7 +454,7 @@ reload_web_server:
 		$(MAKE) start_web_server; \
 	fi
 
-launch_protractor:	all e2e-tests/conf/apache2.pid
+launch_protractor:
 	# Start e2e tests
 	# NB: you must have protractor installed (using npm install -g protractor)
 	# and have run update-webdriver at least once and have a node.js > 4.0
diff --git a/e2e-tests/manager/36-diff.js b/e2e-tests/manager/36-diff.js
new file mode 100644
index 000000000..0d57f0182
--- /dev/null
+++ b/e2e-tests/manager/36-diff.js
@@ -0,0 +1,20 @@
+'use strict';
+
+/* http://docs.angularjs.org/guide/dev_guide.e2e-testing */
+
+describe('Lemonldap::NG Manager', function() {
+
+  describe('Diff interface', function() {
+
+    it('should find key changed', function() {
+      browser.get('/diff.html#6/7');
+      element(by.id('t-generalParameters')).click();
+      element(by.id('t-advancedParams')).click();
+      element(by.id('t-security')).click();
+      element(by.id('t-key')).click();
+      expect(element(by.id('tdold')).getText()).toEqual('éà©®');
+      expect(element(by.id('tdnew')).getText()).toEqual('qwertyui');
+    });
+
+  });
+});
diff --git a/lemonldap-ng-manager/site/templates/diff.tpl b/lemonldap-ng-manager/site/templates/diff.tpl
index 72f42ee45..1101a259b 100644
--- a/lemonldap-ng-manager/site/templates/diff.tpl
+++ b/lemonldap-ng-manager/site/templates/diff.tpl
@@ -55,13 +55,13 @@
         <table class="table table-striped">
           <tr ng-show="currentNode.oldvalue">
             <th><span class="old" trspan="oldValue"></span></th>
-            <td ng-show="currentNode.oldvalue.constructor === 'array'">{{currentNode.oldvalue|json}}</td>
-            <td ng-hide="currentNode.oldvalue.constructor === 'array'">{{currentNode.oldvalue}}</td>
+            <td id="tdoldarray" ng-show="currentNode.oldvalue.constructor === 'array'">{{currentNode.oldvalue|json}}</td>
+            <td id="tdold" ng-hide="currentNode.oldvalue.constructor === 'array'">{{currentNode.oldvalue}}</td>
           </tr>
           <tr ng-show="currentNode.newvalue">
             <th><span class="new" trspan="newValue"></span></th>
-            <td ng-show="currentNode.newvalue.constructor === 'array'">{{currentNode.newvalue|json}}</td>
-            <td ng-hide="currentNode.newvalue.constructor === 'array'">{{currentNode.newvalue}}</td>
+            <td id="tdnewarray" ng-show="currentNode.newvalue.constructor === 'array'">{{currentNode.newvalue|json}}</td>
+            <td id="tdnew" ng-hide="currentNode.newvalue.constructor === 'array'">{{currentNode.newvalue}}</td>
           </tr>
         </table>
       </div>
@@ -71,7 +71,7 @@
   <script type="text/ng-template" id="nodes_renderer.html">
     <div ui-tree-handle class="tree-node tree-node-content panel-info tree-node-default">
       <span ng-include="'arrow.html'"></span>
-      <span ng-click="stoggle(this,node)">{{node.title}}</span>
+      <span id="t-{{node.id}}" ng-click="stoggle(this,node)">{{node.title}}</span>
     </div>
     <ol ui-tree-nodes="" ng-model="node" ng-class="{hidden: collapsed}" ng-include="'subnodes.html'">
     </ol>
@@ -79,7 +79,7 @@
   <script type="text/ng-template" id="newnodes_renderer.html">
     <div ui-tree-handle class="tree-node tree-node-content panel-info tree-node-default">
       <span ng-include="'arrow.html'"></span>
-      <span ng-click="stoggle(this,node)" class="new">{{node.title}}</span>
+      <span id="t-{{node.id}}" ng-click="stoggle(this,node)" class="new">{{node.title}}</span>
     </div>
     <ol ui-tree-nodes="" ng-model="node" ng-class="{hidden: collapsed}" ng-include="'subnodes.html'">
     </ol>
@@ -87,7 +87,7 @@
   <script type="text/ng-template" id="oldnodes_renderer.html">
     <div ui-tree-handle class="tree-node tree-node-content panel-info tree-node-default">
       <span ng-include="'arrow.html'"></span>
-      <span ng-click="stoggle(this,node)" class="old">{{node.title}}</span>
+      <span id="t-{{node.id}}" ng-click="stoggle(this,node)" class="old">{{node.title}}</span>
     </div>
     <ol ui-tree-nodes="" ng-model="node" ng-class="{hidden: collapsed}" ng-include="'subnodes.html'">
     </ol>