Project

General

Profile

« Previous | Next » 

Revision 365a906d

Added by Andreas Kohlbecker about 12 years ago

updating selenium to latest version for compatibility with FireFox 14 & fixing bug related to finding link target windows

View differences:

5.x/modules/cdm_dataportal/test/java/dataportal-selenium-tests/pom.xml
1 1
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2
	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3
	<modelVersion>4.0.0</modelVersion>
2
  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3
  <modelVersion>4.0.0</modelVersion>
4 4

  
5
	<groupId>eu.etaxonomy</groupId>
6
	<artifactId>dataportal-selenium-tests</artifactId>
7
	<version>1.0-SNAPSHOT</version>
8
	<packaging>jar</packaging>
5
  <groupId>eu.etaxonomy</groupId>
6
  <artifactId>dataportal-selenium-tests</artifactId>
7
  <version>1.0-SNAPSHOT</version>
8
  <packaging>jar</packaging>
9 9

  
10
	<name>dataportal-selenium-tests</name>
11
	<url>http://maven.apache.org</url>
10
  <name>dataportal-selenium-tests</name>
11
  <url>http://maven.apache.org</url>
12 12

  
13
	<properties>
14
		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
15
		<selenium-version>2.21.0</selenium-version>
16
	</properties>
13
  <properties>
14
    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
15
    <selenium-version>2.24.1</selenium-version>
16
  </properties>
17 17

  
18
	<scm>
19
		<connection>scm:svn:http://dev.e-taxonomy.eu/svn/trunk/drupal/modules/cdm_dataportal/test/java/dataportal-selenium-tests</connection>
20
		<developerConnection>scm:svn:https://dev.e-taxonomy.eu/svn/trunk/drupal/modules/cdm_dataportal/test/java/dataportal-selenium-tests</developerConnection>
21
		<url>http://dev.e-taxonomy.eu/trac/browser/trunk/drupal/modules/cdm_dataportal/test/java/dataportal-selenium-tests</url>
22
	</scm>
18
  <scm>
19
    <connection>scm:svn:http://dev.e-taxonomy.eu/svn/trunk/drupal/modules/cdm_dataportal/test/java/dataportal-selenium-tests</connection>
20
    <developerConnection>scm:svn:https://dev.e-taxonomy.eu/svn/trunk/drupal/modules/cdm_dataportal/test/java/dataportal-selenium-tests</developerConnection>
21
    <url>http://dev.e-taxonomy.eu/trac/browser/trunk/drupal/modules/cdm_dataportal/test/java/dataportal-selenium-tests</url>
22
  </scm>
23 23

  
24
	<developers>
25
		<developer>
26
			<!-- your SVN account id please! -->
27
			<id>a.kohlbecker</id>
28
			<name>
29
				Andreas Kohlbecker
30
			</name>
31
			<email>a.kohlbecker [at] bgbm.org</email>
32
			<organization>
33
				Botanical Garden Botanical Museum Berlin
34
			</organization>
35
			<organizationUrl>http://www.bgbm.org/BioDivInf/</organizationUrl>
36
			<timezone>+1</timezone>
37
			<roles>
38
				<role>Developer</role>
39
			</roles>
40
			<url></url>
41
		</developer>
42
	</developers>
24
  <developers>
25
    <developer>
26
      <!-- your SVN account id please! -->
27
      <id>a.kohlbecker</id>
28
      <name>
29
        Andreas Kohlbecker
30
      </name>
31
      <email>a.kohlbecker [at] bgbm.org</email>
32
      <organization>
33
        Botanical Garden Botanical Museum Berlin
34
      </organization>
35
      <organizationUrl>http://www.bgbm.org/BioDivInf/</organizationUrl>
36
      <timezone>+1</timezone>
37
      <roles>
38
        <role>Developer</role>
39
      </roles>
40
      <url></url>
41
    </developer>
42
  </developers>
43 43

  
44
	<repositories>
45
		<repository>
46
			<id>central</id>
47
			<name>Maven Repository Switchboard</name>
48
			<layout>default</layout>
49
			<url>http://repo1.maven.org/maven2</url>
50
			<snapshots>
51
				<enabled>false</enabled>
52
			</snapshots>
53
		</repository>
54
	</repositories>
44
  <repositories>
45
    <repository>
46
      <id>central</id>
47
      <name>Maven Repository Switchboard</name>
48
      <layout>default</layout>
49
      <url>http://repo1.maven.org/maven2</url>
50
      <snapshots>
51
        <enabled>false</enabled>
52
      </snapshots>
53
    </repository>
54
  </repositories>
55 55

  
56 56

  
57
	<!-- **** PLUGINS **** -->
58
	<build>
59
		<plugins>
60
			<plugin>
61
				<artifactId>maven-compiler-plugin</artifactId>
62
				<configuration>
63
					<source>1.6</source>
64
					<target>1.6</target>
65
				</configuration>
66
			</plugin>
67
			<plugin>
68
				<groupId>org.apache.maven.plugins</groupId>
69
				<artifactId>maven-eclipse-plugin</artifactId>
70
				<configuration>
71
					<downloadSources>true</downloadSources>
72
					<downloadJavadocs>true</downloadJavadocs>
73
				</configuration>
74
			</plugin>
75
		</plugins>
76
	</build>
57
  <!-- **** PLUGINS **** -->
58
  <build>
59
    <plugins>
60
      <plugin>
61
        <artifactId>maven-compiler-plugin</artifactId>
62
        <configuration>
63
          <source>1.6</source>
64
          <target>1.6</target>
65
        </configuration>
66
      </plugin>
67
      <plugin>
68
        <groupId>org.apache.maven.plugins</groupId>
69
        <artifactId>maven-eclipse-plugin</artifactId>
70
        <configuration>
71
          <downloadSources>true</downloadSources>
72
          <downloadJavadocs>true</downloadJavadocs>
73
        </configuration>
74
      </plugin>
75
    </plugins>
76
  </build>
77 77

  
78
	<dependencies>
79
		<dependency>
80
			<groupId>junit</groupId>
81
			<artifactId>junit</artifactId>
82
			<version>4.6</version>
83
		</dependency>
84
		<dependency>
85
			<groupId>log4j</groupId>
86
			<artifactId>log4j</artifactId>
87
			<version>1.2.16</version>
88
		</dependency>
89
		<!--
90
			selenium 2 webdriver, see
91
			http://seleniumhq.org/docs/03_webdriver.html#with-maven
92
		-->
93
		<!--
94
		<dependency>
95
			<groupId>org.seleniumhq.selenium</groupId>
96
			<artifactId>selenium-parent</artifactId>
97
			<version>${selenium-version}</version>
98
		</dependency>
99
		 -->
100
		<dependency>
101
			<groupId>org.seleniumhq.selenium</groupId>
102
			<artifactId>selenium-firefox-driver</artifactId>
103
			<version>${selenium-version}</version>
104
		</dependency>
105
		<dependency>
106
			<groupId>org.seleniumhq.selenium</groupId>
107
			<artifactId>selenium-support</artifactId>
108
			<version>${selenium-version}</version>
109
		</dependency>
110
		<dependency>
111
			<groupId>org.seleniumhq.selenium</groupId>
112
			<artifactId>selenium-api</artifactId>
113
			<version>${selenium-version}</version>
114
		</dependency>
115
		<dependency>
116
			<!-- Selenese emulation -->
117
			<groupId>org.seleniumhq.selenium</groupId>
118
			<artifactId>selenium-java</artifactId>
119
			<version>${selenium-version}</version>
120
		</dependency>
121
		<dependency>
122
			<groupId>org.seleniumhq.selenium</groupId>
123
			<artifactId>selenium-chrome-driver</artifactId>
124
			<version>${selenium-version}</version>
125
		</dependency>
126
		<dependency>
127
			<groupId>org.seleniumhq.selenium</groupId>
128
			<artifactId>selenium-ie-driver</artifactId>
129
			<version>${selenium-version}</version>
130
		</dependency>
131
		<dependency>
132
			<groupId>org.seleniumhq.selenium</groupId>
133
			<artifactId>selenium-htmlunit-driver</artifactId>
134
			<version>${selenium-version}</version>
135
		</dependency>
136
	</dependencies>
78
  <dependencies>
79
    <dependency>
80
      <groupId>junit</groupId>
81
      <artifactId>junit</artifactId>
82
      <version>4.6</version>
83
    </dependency>
84
    <dependency>
85
      <groupId>log4j</groupId>
86
      <artifactId>log4j</artifactId>
87
      <version>1.2.16</version>
88
    </dependency>
89
    <!--
90
      selenium 2 webdriver, see
91
      http://seleniumhq.org/docs/03_webdriver.html#with-maven
92
    -->
93
    <!--
94
    <dependency>
95
      <groupId>org.seleniumhq.selenium</groupId>
96
      <artifactId>selenium-parent</artifactId>
97
      <version>${selenium-version}</version>
98
    </dependency>
99
     -->
100
    <dependency>
101
      <groupId>org.seleniumhq.selenium</groupId>
102
      <artifactId>selenium-firefox-driver</artifactId>
103
      <version>${selenium-version}</version>
104
    </dependency>
105
    <dependency>
106
      <groupId>org.seleniumhq.selenium</groupId>
107
      <artifactId>selenium-support</artifactId>
108
      <version>${selenium-version}</version>
109
    </dependency>
110
    <dependency>
111
      <groupId>org.seleniumhq.selenium</groupId>
112
      <artifactId>selenium-api</artifactId>
113
      <version>${selenium-version}</version>
114
    </dependency>
115
    <dependency>
116
      <!-- Selenese emulation -->
117
      <groupId>org.seleniumhq.selenium</groupId>
118
      <artifactId>selenium-java</artifactId>
119
      <version>${selenium-version}</version>
120
    </dependency>
121
    <dependency>
122
      <groupId>org.seleniumhq.selenium</groupId>
123
      <artifactId>selenium-chrome-driver</artifactId>
124
      <version>${selenium-version}</version>
125
    </dependency>
126
    <dependency>
127
      <groupId>org.seleniumhq.selenium</groupId>
128
      <artifactId>selenium-ie-driver</artifactId>
129
      <version>${selenium-version}</version>
130
    </dependency>
131
    <dependency>
132
      <groupId>org.seleniumhq.selenium</groupId>
133
      <artifactId>selenium-htmlunit-driver</artifactId>
134
      <version>${selenium-version}</version>
135
    </dependency>
136
  </dependencies>
137 137

  
138 138
</project>
5.x/modules/cdm_dataportal/test/java/dataportal-selenium-tests/src/main/java/eu/etaxonomy/dataportal/elements/BaseElement.java
74 74
        if(linksInElement == null){
75 75
            linksInElement = new ArrayList<LinkElement>();
76 76

  
77
            if(getElement().getTagName().equals("a") && getElement().getAttribute("href") != null){
77
            if(getElement().getTagName().equals("a") && getElement().getAttribute("href") != null && getElement().getAttribute("href").length() > 0){
78 78
                // BaseElement is link itself
79 79
                linksInElement.add(new LinkElement(getElement()));
80 80
            } else {
......
92 92

  
93 93
        List<String> targets = new ArrayList<String>();
94 94

  
95
        if(element instanceof LinkElement){
95
        if(getElement().getTagName().equals("a") && getElement().getAttribute("target") != null  && getElement().getAttribute("target").length() > 0){
96 96
            targets.add(getElement().getAttribute("target"));
97 97
        } else {
98 98
            try {

Also available in: Unified diff