Project

General

Profile

Revision 0b606c0d

ID0b606c0d87144a9bb703f6a38a14cab24bb07b14
Parent 75f01b13
Child 14a1655f

Added by Andreas Kohlbecker about 7 years ago

bugfix

View differences:

7.x/modules/cdm_dataportal/cdm_api/cdm_api.module
1737 1737
 */
1738 1738
function cdm_http_request($uri, $method = "GET", $data = NULL) {
1739 1739
  static $acceptLanguage = NULL;
1740
  $header = array();
1740 1741

  
1741 1742
  if (!$acceptLanguage) {
1742 1743
    if (function_exists('apache_request_headers')) {
......
1755 1756
    drupal_set_message('cdm_api.module#cdm_http_request() : unsupported HTTP request method ', 'error');
1756 1757
  }
1757 1758

  
1758
  if (empty($header) && _is_cdm_ws_uri($uri)) {
1759
  if (_is_cdm_ws_uri($uri)) {
1759 1760
    $header['Accept'] = 'application/json';
1760 1761
    $header['Accept-Language'] = $acceptLanguage;
1761 1762
    $header['Accept-Charset'] = 'UTF-8';
7.x/modules/cdm_dataportal/test/java/dataportal-selenium-tests/src/main/java/eu/etaxonomy/dataportal/pages/PortalPage.java
7 7
import java.util.List;
8 8
import java.util.concurrent.TimeUnit;
9 9

  
10
import org.apache.bcel.verifier.exc.LinkingConstraintException;
11 10
import org.apache.log4j.Logger;
12 11
import org.openqa.selenium.By;
13 12
import org.openqa.selenium.NoSuchElementException;
......
20 19
import org.openqa.selenium.support.PageFactory;
21 20
import org.openqa.selenium.support.ui.WebDriverWait;
22 21

  
23
import sun.swing.StringUIClientPropertyKey;
24

  
25 22
import com.google.common.base.Function;
26 23

  
27 24
import eu.etaxonomy.dataportal.DataPortalContext;
......
71 68
    @FindBy(id="cdm_dataportal.node")
72 69
    protected WebElement portalContent;
73 70

  
74
    @FindBy(tagName="title")
75
    @CacheLookup
76
    protected WebElement title;
71
//    @FindBy(tagName="title")
72
//    @CacheLookup
73
//    protected WebElement title;
77 74

  
78 75
    @FindBy(className="node")
79 76
    protected WebElement node;
......
227 224
    }
228 225

  
229 226
    /**
230
     * returns the string from the <code>title</code> tag.
231
     * @return
227
     *
228
     * @return the page title
229
     * @deprecated use {@link driver#getTitle()}
232 230
     */
231
    @Deprecated
233 232
    public String getTitle() {
234
        return title.getText();
233
        return driver.getTitle();
235 234
    }
236 235

  
237 236
    /**
......
309 308
        return pageUrl.getProtocol() + "://" + pageUrl.getHost() + pageUrl.getPort();
310 309
    }
311 310

  
311
    @Override
312 312
    public boolean equals(Object obj) {
313 313
        if (PortalPage.class.isAssignableFrom(obj.getClass())) {
314 314
            PortalPage page = (PortalPage) obj;

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)