diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-04-25 10:53:15 -0500 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-04-25 10:53:15 -0500 |
| commit | ef7f002e31fef9d04b96a790c541d3e2296ba918 (patch) | |
| tree | a549267939de224059c10b77f0eb51dddeb1d431 /spec | |
| parent | 56982fcf24ba4290dcca6b8c4e852d716b179748 (diff) | |
| parent | dc69ae177b9481711cee0bd9988e41145ec9fdf0 (diff) | |
| download | gitlab-ce-ef7f002e31fef9d04b96a790c541d3e2296ba918.tar.gz | |
Merge branch 'bootstrap4' of gitlab.com:gitlab-org/gitlab-ce into bootstrap4
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/features/projects/tree/create_directory_spec.rb | 2 | ||||
| -rw-r--r-- | spec/javascripts/sidebar/sidebar_move_issue_spec.js | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/spec/features/projects/tree/create_directory_spec.rb b/spec/features/projects/tree/create_directory_spec.rb index fb57de141e7..b242e41df1c 100644 --- a/spec/features/projects/tree/create_directory_spec.rb +++ b/spec/features/projects/tree/create_directory_spec.rb @@ -10,8 +10,6 @@ feature 'Multi-file editor new directory', :js do visit project_tree_path(project, :master) - live_debug - wait_for_requests click_link('Web IDE') diff --git a/spec/javascripts/sidebar/sidebar_move_issue_spec.js b/spec/javascripts/sidebar/sidebar_move_issue_spec.js index a3fb965fbab..1777053d370 100644 --- a/spec/javascripts/sidebar/sidebar_move_issue_spec.js +++ b/spec/javascripts/sidebar/sidebar_move_issue_spec.js @@ -14,7 +14,9 @@ describe('SidebarMoveIssue', function () { this.$content = $(` <div class="dropdown"> <div class="js-toggle"></div> - <div class="dropdown-content"></div> + <div class="dropdown-menu"> + <div class="dropdown-content"></div> + </div> <div class="js-confirm-button"></div> </div> `); |