Merge pull request #1980 from robinboening/allow_pound_sign_in_legacy…

…_url

Allow pound sign in legacy url

app/models/alchemy/legacy_page_url.rb

@@ -18,5 +18,5 @@ class Alchemy::LegacyPageUrl < ActiveRecord::Base
 
   validates :urlname,
     presence: true,
-    format: {with: /\A[:\.\w\-+_\/\?&%;=]*\z/}
+    format: {with: /\A[:\.\w\-+_\/\?&%;=#]*\z/}
 end

spec/models/alchemy/legacy_page_url_spec.rb

@@ -5,19 +5,27 @@
 describe Alchemy::LegacyPageUrl do
   let(:page) { build_stubbed(:alchemy_page) }
 
-  let(:page_url_with_parameters) do
-    Alchemy::LegacyPageUrl.new(urlname: "index.php?id=2", page: page)
+  it "is invalid with invalid URL characters" do
+    expect(
+      described_class.new(urlname: "<foo>{bar}", page: page)
+    ).to be_invalid
   end
 
-  let(:valid_page_url) do
-    Alchemy::LegacyPageUrl.new(urlname: "my/0-work+is-nice_stuff", page: page)
+  it "is valid with correct urlname format" do
+    expect(
+      described_class.new(urlname: "my/0-work+is-nice_stuff", page: page)
+    ).to be_valid
   end
 
-  it "is only valid with correct urlname format" do
-    expect(valid_page_url).to be_valid
+  it "is valid with get parameters in urlname" do
+    expect(
+      described_class.new(urlname: "index.php?id=2", page: page)
+    ).to be_valid
   end
 
-  it "is also valid with get parameters in urlname" do
-    expect(page_url_with_parameters).to be_valid
+  it "is valid with pound sign in urlname" do
+    expect(
+      described_class.new(urlname: "with#anchor", page: page)
+    ).to be_valid
   end
 end