Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Instagram pattern #2859

Merged
merged 8 commits into from
Oct 30, 2018
Merged

Instagram pattern #2859

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e87075a
Add before save to check the instagram link pattern
Oct 11, 2018
48720c8
Add spec to instagram pattern
Oct 11, 2018
e46b356
Remove the check for www.instagram.com
Oct 11, 2018
6ad32fb
Add check for instagram.com
Oct 11, 2018
02bc134
Change befor save check to format validation
Oct 15, 2018
93a051b
Regex ajust
Oct 16, 2018
8e4adbd
Add more test cases
Oct 16, 2018
419493f
Move instagram regex to an method to fix codeclimate
Oct 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions app/models/enterprise.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ class Enterprise < ActiveRecord::Base
before_validation :set_unused_address_fields
after_validation :geocode_address

validates :instagram, format: /\A@[a-zA-Z0-9._]{1,30}\z/, :allow_blank => true
albarnaz marked this conversation as resolved.
Show resolved Hide resolved

after_touch :touch_distributors
after_create :set_default_contact
after_create :relate_to_owners_enterprises
Expand Down Expand Up @@ -330,6 +332,10 @@ def can_invoice?
abn.present?
end

def instagram=(value)
write_attribute(:instagram, value.try(:gsub, %r{\Ahttps?://(?:www.)?instagram.com/([a-zA-Z0-9._]{1,30})/?\z}, '@\1'))
albarnaz marked this conversation as resolved.
Show resolved Hide resolved
end

protected

def devise_mailer
Expand Down
8 changes: 8 additions & 0 deletions spec/models/enterprise_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,14 @@
it "sets the enterprise contact to the owner by default" do
enterprise.contact.should eq enterprise.owner
end

context "prevent an wrong instagram link pattern" do
let(:e) { build(:enterprise, instagram: 'instagram.com/my_user') }

it "expects the instagram attribute to not be valid" do
expect(e).to_not be_valid
albarnaz marked this conversation as resolved.
Show resolved Hide resolved
end
end
end

describe "preferred_shopfront_taxon_order" do
Expand Down