diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-02-14 12:27:47 -0600 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-02-15 13:31:18 -0600 |
| commit | 8c1b41f12b5ec8dd3dd2547d3ad729e71c4ebadd (patch) | |
| tree | 222a746fc2d0a811149389ff74053e4a3fe9e456 | |
| parent | 2fc559142e00cc15a47c49c190666284221cc9b0 (diff) | |
| download | gitlab-ce-8c1b41f12b5ec8dd3dd2547d3ad729e71c4ebadd.tar.gz | |
Move migration to post_migrate; fix shortcuts_spec
| -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 |