Unverified Commit 23d8af9e authored by Dennis Schubert's avatar Dennis Schubert
Browse files

Merge pull request #6971 from svbergerem/poltergeist-disable-animations 

Disable animations in poltergeist
parents 47c6b4ef 9108182d

app/assets/stylesheets/poltergeist_disable_transition.scss

0 → 100644
+9 −0
Original line number Diff line number Diff line 
// Overrides used for poltergeist tests

// scss-lint:disable all

* {

  -moz-transition: none !important;

  -o-transition: none !important;

  -webkit-transition: none !important;

  transition: none !important;

}

// scss-lint:enable all

app/views/layouts/application.html.haml

+3 −0
Original line number Diff line number Diff line
@@ -26,6 +26,9 @@ 
    - if rtl?

      = stylesheet_link_tag :rtl, media:  'all'



    - if Rails.env.test?

      = stylesheet_link_tag :poltergeist_disable_transition, media: "all"



    = old_browser_js_support

    <!--[if IE]>

    = javascript_include_tag :ie

app/views/layouts/application.mobile.haml

+3 −0
Original line number Diff line number Diff line
@@ -46,6 +46,9 @@ 
    - if rtl?

      = stylesheet_link_tag :rtl, :media => 'all'



    - if Rails.env.test?

      = stylesheet_link_tag :poltergeist_disable_transition, media: "all"



    = yield(:head)



    = include_gon(:camel_case => true)

features/desktop/signs_up.feature

+0 −1
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ Feature: new user registration 
  Scenario: closing a popover clears getting started

    When I confirm the alert after I follow "awesome_button"

    Then I should be on the stream page

    And I have turned off jQuery effects

    And I wait for the popovers to appear

    And I click close on all the popovers

    And I close the publisher

features/mobile/drawer.feature

+6 −6
Original line number Diff line number Diff line
@@ -30,15 +30,15 @@ Feature: Navigate between pages using the header menu and the drawer 
    Then I should be on the new status message page



  Scenario: search a user

    When I have turned off jQuery effects

    And I open the drawer

    And I search for "Bob"

    When I open the drawer

    Then I should see a "#q" within "#drawer"

    When I search for "Bob"

    Then I should see "Users matching Bob" within "#search_title"



  Scenario: search for a tag

    When I have turned off jQuery effects

    And I open the drawer

    And I search for "#bob"

    When I open the drawer

    Then I should see a "#q" within "#drawer"

    When I search for "#bob"

    Then I should be on the tag page for "bob"



  Scenario: navigate to my activity page