Skip to content

Commit 3c58c82

Browse files
committed
Fixing Window sizing tests for Firefox 26 on Windows.
Starting with Firefox 26, the minimum width of the window is ~405 pixels. The tests attempted to set the window width to 275 pixels, which would not succeed. We now use 450 pixels as the width to set to.
1 parent 64c68bb commit 3c58c82

File tree

2 files changed

+70
-13
lines changed

2 files changed

+70
-13
lines changed

Diff for: dotnet/test/common/WindowTest.cs

+67-10
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public void ShouldBeAbleToSetThePositionOfTheCurrentWindow()
7979
{
8080
IWindow window = driver.Manage().Window;
8181
Point position = window.Position;
82-
82+
8383
Point targetPosition = new Point(position.X + 10, position.Y + 10);
8484
window.Position = targetPosition;
8585

@@ -98,21 +98,78 @@ public void ShouldBeAbleToSetThePositionOfTheCurrentWindow()
9898
[IgnoreBrowser(Browser.PhantomJS, "As a headless browser, there is no position of the window.")]
9999
public void ShouldBeAbleToMaximizeTheCurrentWindow()
100100
{
101-
Size targetSize = new Size(275, 275);
102-
IWindow window = driver.Manage().Window;
103-
104-
window.Size = targetSize;
105-
WaitFor(WindowHeightToBeEqualTo(targetSize.Height));
106-
WaitFor(WindowWidthToBeEqualTo(targetSize.Height));
101+
Size targetSize = new Size(450, 275);
107102

108-
window.Maximize();
109-
WaitFor(WindowHeightToBeGreaterThan(targetSize.Height));
110-
WaitFor(WindowWidthToBeGreaterThan(targetSize.Width));
103+
ChangeSizeTo(targetSize);
111104

105+
Maximize();
106+
107+
IWindow window = driver.Manage().Window;
112108
Assert.Greater(window.Size.Height, targetSize.Height);
113109
Assert.Greater(window.Size.Width, targetSize.Width);
114110
}
115111

112+
[Test]
113+
[IgnoreBrowser(Browser.HtmlUnit, "Not implemented in driver")]
114+
[IgnoreBrowser(Browser.Opera, "Not implemented in driver")]
115+
[IgnoreBrowser(Browser.Android, "Not implemented in driver")]
116+
[IgnoreBrowser(Browser.IPhone, "Not implemented in driver")]
117+
[IgnoreBrowser(Browser.PhantomJS, "As a headless browser, there is no position of the window.")]
118+
public void ShouldBeAbleToMaximizeTheWindowFromFrame()
119+
{
120+
driver.Url = framesetPage;
121+
ChangeSizeTo(new Size(450, 275));
122+
123+
driver.SwitchTo().Frame("fourth");
124+
try
125+
{
126+
Maximize();
127+
}
128+
finally
129+
{
130+
driver.SwitchTo().DefaultContent();
131+
}
132+
}
133+
134+
[Test]
135+
[IgnoreBrowser(Browser.HtmlUnit, "Not implemented in driver")]
136+
[IgnoreBrowser(Browser.Opera, "Not implemented in driver")]
137+
[IgnoreBrowser(Browser.Android, "Not implemented in driver")]
138+
[IgnoreBrowser(Browser.IPhone, "Not implemented in driver")]
139+
[IgnoreBrowser(Browser.PhantomJS, "As a headless browser, there is no position of the window.")]
140+
public void ShouldBeAbleToMaximizeTheWindowFromIframe()
141+
{
142+
driver.Url = iframePage;
143+
ChangeSizeTo(new Size(450, 275));
144+
145+
driver.SwitchTo().Frame("iframe1-name");
146+
try
147+
{
148+
Maximize();
149+
}
150+
finally
151+
{
152+
driver.SwitchTo().DefaultContent();
153+
}
154+
}
155+
156+
private void Maximize()
157+
{
158+
IWindow window = driver.Manage().Window;
159+
Size currentSize = window.Size;
160+
window.Maximize();
161+
WaitFor(WindowHeightToBeGreaterThan(currentSize.Height));
162+
WaitFor(WindowWidthToBeGreaterThan(currentSize.Width));
163+
}
164+
165+
private void ChangeSizeTo(Size targetSize)
166+
{
167+
IWindow window = driver.Manage().Window;
168+
window.Size = targetSize;
169+
WaitFor(WindowHeightToBeEqualTo(targetSize.Height));
170+
WaitFor(WindowWidthToBeEqualTo(targetSize.Width));
171+
}
172+
116173
private Func<bool> WindowHeightToBeEqualTo(int height)
117174
{
118175
return () => { return driver.Manage().Window.Size.Height == height; };

Diff for: java/client/test/org/openqa/selenium/WindowTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public void testSetsThePositionOfTheCurrentWindow() throws InterruptedException
121121
public void testCanMaximizeTheWindow() throws InterruptedException {
122122
assumeThereIsAWindowManager();
123123

124-
changeSizeTo(new Dimension(275, 275));
124+
changeSizeTo(new Dimension(450, 275));
125125
maximize();
126126
}
127127

@@ -131,7 +131,7 @@ public void testCanMaximizeTheWindowFromFrame() throws InterruptedException {
131131
assumeThereIsAWindowManager();
132132

133133
driver.get(pages.framesetPage);
134-
changeSizeTo(new Dimension(275, 275));
134+
changeSizeTo(new Dimension(450, 275));
135135

136136
driver.switchTo().frame("fourth");
137137
try {
@@ -147,7 +147,7 @@ public void testCanMaximizeTheWindowFromIframe() throws InterruptedException {
147147
assumeThereIsAWindowManager();
148148

149149
driver.get(pages.iframePage);
150-
changeSizeTo(new Dimension(275, 275));
150+
changeSizeTo(new Dimension(450, 275));
151151

152152
driver.switchTo().frame("iframe1-name");
153153
try {

0 commit comments

Comments
 (0)