diff options
| -rw-r--r-- | db/post_migrate/20170213172852_remove_theme_id_from_users.rb (renamed from db/migrate/20170213172852_remove_theme_id_from_users.rb) | 2 | ||||
| -rw-r--r-- | spec/features/dashboard/shortcuts_spec.rb | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/db/migrate/20170213172852_remove_theme_id_from_users.rb b/db/post_migrate/20170213172852_remove_theme_id_from_users.rb index cd6388ab7d2..857f678ad0e 100644 --- a/db/migrate/20170213172852_remove_theme_id_from_users.rb +++ b/db/post_migrate/20170213172852_remove_theme_id_from_users.rb @@ -5,7 +5,7 @@ class RemoveThemeIdFromUsers < ActiveRecord::Migration include Gitlab::Database::MigrationHelpers # Set this constant to true if this migration requires downtime. - DOWNTIME = true + DOWNTIME = false # When a migration requires downtime you **must** uncomment the following # constant and define a short and easy to understand explanation as to why the diff --git a/spec/features/dashboard/shortcuts_spec.rb b/spec/features/dashboard/shortcuts_spec.rb index d9be4e5dbdd..c5a0d1c6d99 100644 --- a/spec/features/dashboard/shortcuts_spec.rb +++ b/spec/features/dashboard/shortcuts_spec.rb @@ -24,6 +24,7 @@ feature 'Dashboard shortcuts', feature: true, js: true do end def ensure_active_main_tab(content) - expect(find('.nav-sidebar li.active')).to have_content(content) + find('.global-dropdown-toggle').trigger('click') + expect(find('.global-dropdown-menu li.active')).to have_content(content) end end |