Skip to content

Commit

Permalink
Doc: fix minor details in the marketplace section. Fix #299
Browse files Browse the repository at this point in the history
  • Loading branch information
aarranz committed Sep 25, 2017
1 parent 41e3dda commit c146c1b
Show file tree
Hide file tree
Showing 9 changed files with 2 additions and 39 deletions.
Binary file modified docs/images/user_guide/bae/add_new_marketplace_entry.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/user_guide/bae/marketplace_dropdown.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/user_guide/bae/summary.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
4 changes: 1 addition & 3 deletions docs/user_guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,6 @@ workspace features:
Browsing the Marketplace
------------------------

### Marketplaces and Stores

A mashup tool like WireCloud must support access to **marketplaces**, where
people can offer and deal with services made accessible through widgets and
operators, like goods, and finally mashup them to create value added services
Expand All @@ -101,7 +99,7 @@ When looking for an offer of widgets, operators and mashups, you first need to
choose a marketplace. Use the dropdown menu shown in the workspace path for this
purpose.

<img src="../images/user_guide/browsing_marketplace/marketplace_dropdown.png" srcset="../images/user_guide/browsing_marketplace/marketplace_dropdown.png 2x" alt="Marketplace dropdown"/>
<img src="../images/user_guide/bae/marketplace_dropdown.png" srcset="../images/user_guide/bae/marketplace_dropdown.png 2x" alt="Marketplace dropdown"/>

As shown in the previous screenshot, this menu allows you to choose among the
different marketplaces you have access to. To add a new marketplace, you only
Expand Down
37 changes: 1 addition & 36 deletions src/wirecloud/guidebuilder/tests.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-

# Copyright (c) 2015-2016 CoNWeT Lab., Universidad Politécnica de Madrid
# Copyright (c) 2015-2017 CoNWeT Lab., Universidad Politécnica de Madrid

# This file is part of Wirecloud.

Expand Down Expand Up @@ -386,41 +386,6 @@ def take_capture(*args, **kargs):
select = self.driver.find_element_by_css_selector(
'.se-select select')

# Market list screenshot
imgp = take_capture(self.driver, 'marketplace_with_stores')
add_image(imgp, get_position(select, 0.0, 1.0), 'store_filter.png')
add_pointer(imgp, get_position(select, 0.7, 1.8), False)
crop_down(imgp, select, 80)

# marketplaces screenshot
popup_menu = marketplace.open_menu()
m_menu = popup_menu.get_entry('FIWARE Lab')
ActionChains(self.driver).move_to_element(m_menu).perform()
time.sleep(0.3) # wait entry to be highlighted
imgp = take_capture(self.driver, "marketplace_dropdown")
add_pointer(imgp, get_position(m_menu, 0.8, 0.5))
crop_down(imgp, popup_menu.element, 80)

# Add marketplace
m_menu = popup_menu.get_entry('Add new marketplace')
ActionChains(self.driver).move_to_element(m_menu).perform()
time.sleep(0.3) # wait entry to be highlighted
imgp = take_capture(self.driver, 'add_new_marketplace_entry')
add_pointer(imgp, get_position(m_menu, 0.8, 0.5))
crop_down(imgp, popup_menu.element, 80)

# Adding marketplace
m_menu.click()
dialog = FormModalTester(self, self.wait_element_visible(".wc-add-external-catalogue-modal"))
dialog.get_field("title").set_value('FIWARE Lab')
dialog.get_field("url").set_value('https://marketplace.lab.fiware.org')
dialog.get_field("type").set_value('fiware')
imgp = take_capture(self.driver, 'add_new_marketplace_dialog')
crop_image(imgp, *create_box(dialog.element))

# Cancel marketplace creation
dialog.cancel()

# Where are my resources
btn = self.find_navbar_button('wc-show-myresources-button')
ActionChains(self.driver).move_to_element(btn.element).perform()
Expand Down

0 comments on commit c146c1b

Please sign in to comment.