summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2017-06-09 16:17:01 -0500
committerMike Greiling <mike@pixelcog.com>2017-06-09 16:17:01 -0500
commit72abeb6be72138747b241dafbf16b347c5e876f0 (patch)
tree5f557c729106c63388affa30bbd18aa306b6ea82
parent342e23115523210b60b9f557f1cfbcfdc3361af0 (diff)
downloadgitlab-ce-72abeb6be72138747b241dafbf16b347c5e876f0.tar.gz
resolve more inconsistencies
-rw-r--r--spec/support/wait_for_vue_resource.rb19
-rw-r--r--spec/validators/dynamic_path_validator_spec.rb1
2 files changed, 1 insertions, 19 deletions
diff --git a/spec/support/wait_for_vue_resource.rb b/spec/support/wait_for_vue_resource.rb
deleted file mode 100644
index 3bb3d9c2e51..00000000000
--- a/spec/support/wait_for_vue_resource.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-module WaitForVueResource
- def wait_for_vue_resource(spinner: true)
- Timeout.timeout(Capybara.default_max_wait_time) do
- loop until finished_all_vue_resource_requests?
- end
- end
-
- private
-
- def finished_all_vue_resource_requests?
- return true unless javascript_test?
-
- page.evaluate_script('window.activeVueResources || 0').zero?
- end
-
- def javascript_test?
- Capybara.current_driver == Capybara.javascript_driver
- end
-end
diff --git a/spec/validators/dynamic_path_validator_spec.rb b/spec/validators/dynamic_path_validator_spec.rb
index 8acd2743f2c..8dbf3eecd23 100644
--- a/spec/validators/dynamic_path_validator_spec.rb
+++ b/spec/validators/dynamic_path_validator_spec.rb
@@ -23,6 +23,7 @@ describe DynamicPathValidator do
it 'handles invalid utf8' do
expect(described_class.valid_project_path?("a\0weird\255path")).to be_falsey
end
+ end
describe '#path_valid_for_record?' do
context 'for project' do