diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-10-30 10:17:27 -0500 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-10-30 10:17:27 -0500 |
| commit | 2fbbf45ea646958cba488830c3321c48d38ecece (patch) | |
| tree | a304695bee35c9ed801100897bb6a029fb22fc88 | |
| parent | 6a92dff2bc368aa362a0e239f9fcf953ad4e9e52 (diff) | |
| download | gitlab-ce-2fbbf45ea646958cba488830c3321c48d38ecece.tar.gz | |
fix page render issues on contribution calendar while tests are run
| -rw-r--r-- | app/assets/stylesheets/test.scss | 5 | ||||
| -rw-r--r-- | spec/features/calendar_spec.rb | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/app/assets/stylesheets/test.scss b/app/assets/stylesheets/test.scss index 06733b7f1a9..e65b49c36f3 100644 --- a/app/assets/stylesheets/test.scss +++ b/app/assets/stylesheets/test.scss @@ -4,11 +4,6 @@ -ms-transition: none !important; -webkit-transition: none !important; transition: none !important; - -o-transform: none !important; - -moz-transform: none !important; - -ms-transform: none !important; - -webkit-transform: none !important; - transform: none !important; -webkit-animation: none !important; -moz-animation: none !important; -o-animation: none !important; diff --git a/spec/features/calendar_spec.rb b/spec/features/calendar_spec.rb index 4fc6956d111..9143a417bec 100644 --- a/spec/features/calendar_spec.rb +++ b/spec/features/calendar_spec.rb @@ -112,7 +112,7 @@ feature 'Contributions Calendar', :js do end it 'hides calendar day activities' do - expect(selected_day_activities).to be_empty + expect(find('.user-calendar-activities', visible: false).text).to be_empty end end end |