Added spec for returning to show view on cancelling edit.
conflict merge