diff options
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/vue_shared/vue_resource_interceptor.js | 2 | ||||
| -rw-r--r-- | spec/support/wait_for_ajax.rb | 4 | ||||
| -rw-r--r-- | spec/support/wait_for_vue_resource.rb | 1 |
4 files changed, 6 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 88d536fa9b3..2703ee25c59 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -104,7 +104,6 @@ stages: .rspec-knapsack-mysql: &rspec-knapsack-mysql <<: *rspec-knapsack <<: *use-mysql - <<: *only-master-and-ee-or-mysql <<: *except-docs .spinach-knapsack: &spinach-knapsack @@ -135,7 +134,6 @@ stages: .spinach-knapsack-mysql: &spinach-knapsack-mysql <<: *spinach-knapsack <<: *use-mysql - <<: *only-master-and-ee-or-mysql <<: *except-docs # Trigger a package build on omnibus-gitlab repository diff --git a/app/assets/javascripts/vue_shared/vue_resource_interceptor.js b/app/assets/javascripts/vue_shared/vue_resource_interceptor.js index d5f87588c28..120e01598d7 100644 --- a/app/assets/javascripts/vue_shared/vue_resource_interceptor.js +++ b/app/assets/javascripts/vue_shared/vue_resource_interceptor.js @@ -8,8 +8,10 @@ Vue.use(VueResource); Vue.http.interceptors.push((request, next) => { window.activeVueResources = window.activeVueResources || 0; window.activeVueResources += 1; + console.log("=== Vue interecepting request: " + JSON.stringify(request)); next(() => { + console.log("=== Vue done intercepting request: " + JSON.stringify(request)); window.activeVueResources -= 1; }); }); diff --git a/spec/support/wait_for_ajax.rb b/spec/support/wait_for_ajax.rb index 508de2ee8e1..4218008530e 100644 --- a/spec/support/wait_for_ajax.rb +++ b/spec/support/wait_for_ajax.rb @@ -9,7 +9,9 @@ module WaitForAjax return true unless javascript_test? return true if page.evaluate_script('typeof jQuery === "undefined"') - page.evaluate_script('jQuery.active').zero? + value = page.evaluate_script('jQuery.active') + puts "jQuery active? #{value}" + value.zero? end def javascript_test? diff --git a/spec/support/wait_for_vue_resource.rb b/spec/support/wait_for_vue_resource.rb index 3bb3d9c2e51..3ebf02756f8 100644 --- a/spec/support/wait_for_vue_resource.rb +++ b/spec/support/wait_for_vue_resource.rb @@ -10,6 +10,7 @@ module WaitForVueResource def finished_all_vue_resource_requests? return true unless javascript_test? + puts "=== Vue resource requests #{page.evaluate_script('window.activeVueResources || 0')}" page.evaluate_script('window.activeVueResources || 0').zero? end |