Skip to content

Fix the duplicate of endpoints after ordering endpoints #145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aarranz merged 1 commit into from
Apr 6, 2016
Merged

Fix the duplicate of endpoints after ordering endpoints #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/wirecloud/platform/static/js/wirecloud/ui/WiringEditor/EndpointGroup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,8 @@
var endpoint = this.endpoints[name];

endpoint.index = index;
this.removeChild(endpoint).appendChild(endpoint);
this.superMember(se.Container, 'removeChild', endpoint);
this.appendChild(endpoint);
}, this);

return this;
Expand Down
24 changes: 24 additions & 0 deletions src/wirecloud/platform/wiring/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1684,10 +1684,23 @@ def test_ordering_operator_endpoints(self):
with self.wiring_view as wiring:
with wiring.component_sidebar as sidebar:
operator = sidebar.add_component('operator', "Wirecloud/TestOperatorMultiendpoint")
operator_id = operator.id

targets_count = len(operator.find_endpoints('target'))
sources_count = len(operator.find_endpoints('target'))

with operator.order_endpoints as component_editable:
component_editable.move_endpoint('source', "output1", "output2")
component_editable.move_endpoint('target', "input1", "input3")

self.assertEqual(targets_count, len(operator.find_endpoints('target')))
self.assertEqual(sources_count, len(operator.find_endpoints('source')))

with self.wiring_view as wiring:
operator = wiring.find_draggable_component('operator', id=operator_id)
self.assertEqual(targets_count, len(operator.find_endpoints('target')))
self.assertEqual(sources_count, len(operator.find_endpoints('source')))

@uses_extra_resources(('Wirecloud_TestMultiendpoint_1.0.wgt',), shared=True)
def test_ordering_widget_endpoints(self):
self.login()
Expand All @@ -1702,10 +1715,21 @@ def test_ordering_widget_endpoints(self):
target = operator.find_endpoint('target', 'input')
connection = source.create_connection(target)

targets_count = len(widget.find_endpoints('target'))
sources_count = len(widget.find_endpoints('target'))

with widget.order_endpoints as component_editable:
component_editable.move_endpoint('source', "output1", "output2", must_change=(connection,))
component_editable.move_endpoint('target', "input1", "input3")

self.assertEqual(targets_count, len(widget.find_endpoints('target')))
self.assertEqual(sources_count, len(widget.find_endpoints('source')))

with self.wiring_view as wiring:
widget = wiring.find_draggable_component('widget', id=iwidget.id)
self.assertEqual(targets_count, len(widget.find_endpoints('target')))
self.assertEqual(sources_count, len(widget.find_endpoints('source')))


@wirecloud_selenium_test_case
class BehaviourManagementTestCase(WirecloudSeleniumTestCase):
Expand Down