summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2018-08-02 17:15:25 +0900
committerShinya Maeda <shinya@gitlab.com>2018-08-02 17:15:25 +0900
commit8e0558eac46834dbc6946fc2d1a1cb860e297c4b (patch)
treeecebb2d0a59b9b64e001e806832f08fba437b706
parent280559f404656568b15adfe753f81f8d41de4098 (diff)
downloadgitlab-ce-8e0558eac46834dbc6946fc2d1a1cb860e297c4b.tar.gz
Fix fixtures and factory
-rw-r--r--spec/factories/ci/job_artifacts.rb4
-rw-r--r--spec/fixtures/junit.xml.gzbin568 -> 0 bytes
-rw-r--r--spec/fixtures/junit/junit_ant.xml.gzbin0 -> 1659 bytes
3 files changed, 2 insertions, 2 deletions
diff --git a/spec/factories/ci/job_artifacts.rb b/spec/factories/ci/job_artifacts.rb
index bc73a31d189..46aaaf6aa5d 100644
--- a/spec/factories/ci/job_artifacts.rb
+++ b/spec/factories/ci/job_artifacts.rb
@@ -50,7 +50,7 @@ FactoryBot.define do
after(:build) do |artifact, evaluator|
artifact.file = fixture_file_upload(
- Rails.root.join('spec/fixtures/junit.xml.gz'), 'application/x-gzip')
+ Rails.root.join('spec/fixtures/junit/junit.xml.gz'), 'application/x-gzip')
end
end
@@ -60,7 +60,7 @@ FactoryBot.define do
after(:build) do |artifact, evaluator|
artifact.file = fixture_file_upload(
- Rails.root.join('spec/fixtures/junit/junit_master_ant.xml.gz'), 'application/x-gzip')
+ Rails.root.join('spec/fixtures/junit/junit_ant.xml.gz'), 'application/x-gzip')
end
end
diff --git a/spec/fixtures/junit.xml.gz b/spec/fixtures/junit.xml.gz
deleted file mode 100644
index 88b7de6fa61..00000000000
--- a/spec/fixtures/junit.xml.gz
+++ /dev/null
Binary files differ
diff --git a/spec/fixtures/junit/junit_ant.xml.gz b/spec/fixtures/junit/junit_ant.xml.gz
new file mode 100644
index 00000000000..e9cca1b0c73
--- /dev/null
+++ b/spec/fixtures/junit/junit_ant.xml.gz
Binary files differ