[release/3.0] fixes spec flicker by waiting for content (has_content?)