From cfafd7f3657cb072bb6ab05ec207ea1ae92e7280 Mon Sep 17 00:00:00 2001
From: Jonathan Lipps <jlipps@gmail.com>
Date: Thu, 4 Apr 2013 11:22:09 -0700
Subject: [PATCH] changelog and minor fixes

---
 CHANGELOG.txt           | 33 ++++++++++++++++++++++++++++++++-
 app/ios.js              |  7 ++++---
 test/helpers/webview.js |  2 +-
 3 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 213471178..0c45ee496 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,36 @@
+-------------------------------------
+CHANGES IN VERSION 0.2.2 (from 0.2.1)
+-------------------------------------
+[IOS]
+- safari: use js close() instead of clicking buttons to close windows
+- webview: make title() always return title for default context
+- webview: async javascript execute
+- webview: fix when webelements are returned to client
+- allow launching app via bundle id and not just app path
+- webview: get/set/delete cookie(s)
+- correctly rotate screenshot images if taken in landscape mode
+
+[ANDROID]
+- add eclipse formatting file for bootstrap
+- stop when activity fails to show up
+- make content-desc search case-insensitive and partial
+- allow launching emulator according to device id
+- only sign app for clean apk once
+
+-------------------------------------
+CHANGES IN VERSION 0.2.1 (from 0.2.0)
+-------------------------------------
+[GENERAL]
+- fix bug in npm dependencies (make swig a real dependency)
+
+[IOS]
+- fixed scoping bug in alert handling
+- get rid of --warp flag, instruments-without-delay is better
+- safari: clear cookies/history/windows in between test runs
+
+-------------------------------------
 CHANGES IN VERSION 0.2.0 (from 0.1.3)
--------------
+-------------------------------------
 [GENERAL]
 - updates to reset.sh
 - host our own guinea pig html page for webview tests
diff --git a/app/ios.js b/app/ios.js
index 00ba9a1a9..3d8995ac0 100644
--- a/app/ios.js
+++ b/app/ios.js
@@ -89,9 +89,8 @@ IOS.prototype.cleanup = function(cb) {
 
 IOS.prototype.start = function(cb, onDie) {
   if (this.app && this.bundleId) {
-    cb(new Error("You tried to launch instruments with both an app " +
-                 "specification and a bundle ID. Choose one or the other!"));
-    return;
+    logger.warn("You tried to launch instruments with both an app " +
+                "specification and a bundle ID. Sticking with the app");
   }
   var me = this;
   var didLaunch = false;
@@ -161,6 +160,8 @@ IOS.prototype.start = function(cb, onDie) {
     }
     me.instruments = null;
     me.curCoords = null;
+    me.curOrientation = null;
+    me.bundleId = null;
     if (me.remote !== null) {
       try {
         me.stopRemote();
diff --git a/test/helpers/webview.js b/test/helpers/webview.js
index 46f623435..24d0c9265 100644
--- a/test/helpers/webview.js
+++ b/test/helpers/webview.js
@@ -401,7 +401,7 @@ module.exports.buildTests = function(webviewType) {
         h.driver.getWindowSize(function(err, size) {
           should.not.exist(err);
           // iphone and ipad, webview.app and mobile safari
-          [356, 928, 788, 752].should.include(size.height);
+          [356, 928, 788, 752, 797].should.include(size.height);
           [320, 768, 414].should.include(size.width);
           done();
         });