Skip to content

OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub

join order by name spec into version spec file

Ivan Kuchinf11dcd10dbc7
diff --git a/spec/models/version_spec.rb b/spec/models/version_spec.rb
index fe2dbd3d526..b2a1a8a3b05 100644
--- a/spec/models/version_spec.rb
+++ b/spec/models/version_spec.rb
@@ -571,4 +571,31 @@ RSpec.describe Version do
end
end
end
+
+ describe "order by name" do
+ let(:project) { create(:project) }
+ let(:names) do
+ [
+ "1. xxxx",
+ "1.1. aaa",
+ "1.1. zzz",
+ "1.2. mmm",
+ "1.10. aaa",
+ "9",
+ "10.2",
+ "10.10.2",
+ "10.10.10",
+ "aaaaa",
+ "aaaaa 1."
+ ]
+ end
+ let!(:versions) { names.map { |name| create(:version, name:, project:) } }
+
+ subject { described_class.order(:name, id: :desc).to_a }
+
+ it "returns the versions in semver order" do
+ expect(subject)
+ .to eql versions
+ end
+ end
end
diff --git a/spec/models/versions/order_by_name_spec.rb b/spec/models/versions/order_by_name_spec.rb
deleted file mode 100644
index 541ac7bbda4..00000000000
--- a/spec/models/versions/order_by_name_spec.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-RSpec.describe Version, "order by name" do
- let(:project) { create(:project) }
- let(:names) do
- [
- "1. xxxx",
- "1.1. aaa",
- "1.1. zzz",
- "1.2. mmm",
- "1.10. aaa",
- "9",
- "10.2",
- "10.10.2",
- "10.10.10",
- "aaaaa",
- "aaaaa 1."
- ]
- end
- let!(:versions) { names.map { |name| create(:version, name:, project:) } }
-
- subject { Version.order(:name, id: :desc).to_a }
-
- it "returns the versions in semver order" do
- expect(subject)
- .to eql versions
- end
-end