From 38908396f516ce76132bab0a2c288835668c00c9 Mon Sep 17 00:00:00 2001 From: Sarah Mei Date: Sun, 29 Jan 2012 00:09:29 -0800 Subject: [PATCH] Fix stream view spec to look for different things on FF and on webkit. Sigh. --- spec/javascripts/app/views/stream_view_spec.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/spec/javascripts/app/views/stream_view_spec.js b/spec/javascripts/app/views/stream_view_spec.js index b110f55b8..b5358e48d 100644 --- a/spec/javascripts/app/views/stream_view_spec.js +++ b/spec/javascripts/app/views/stream_view_spec.js @@ -61,11 +61,17 @@ describe("app.views.Stream", function(){ expect(this.statusElement.find('.read-more').length).toEqual(0); }); - xit('collapses the p elements', function() { - // This does not work on firefox. Seems to be different behavior of the expander plugin. Needs more work. + it('collapses the p elements on webkit', function() { + // The expander plugin has different behavior on firefox and webkit >.< expect(this.statusElement.find('.collapsible p').length).toEqual(2); readMoreLink.click(); - expect(this.statusElement.find('.collapsible p').length).toEqual(1); + if(this.statusElement.find('.collapsible .summary').length > 0) { + // Firefox + expect(this.statusElement.find('.collapsible p').length).toEqual(2); + } else { + // Chrome + expect(this.statusElement.find('.collapsible p').length).toEqual(1); + } }); });