diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb index 2bf03382a..c1e24e91e 100644 --- a/app/controllers/registrations_controller.rb +++ b/app/controllers/registrations_controller.rb @@ -3,7 +3,7 @@ # the COPYRIGHT file. class RegistrationsController < Devise::RegistrationsController - before_filter :check_registrations_open_or_vaild_invite!, :check_valid_invite! + before_filter :check_registrations_open_or_valid_invite!, :check_valid_invite! layout ->(c) { request.format == :mobile ? "application" : "with_header" }, :only => [:new] before_filter -> { @css_framework = :bootstrap }, only: [:new, :create] @@ -39,7 +39,7 @@ class RegistrationsController < Devise::RegistrationsController redirect_to new_user_session_path end - def check_registrations_open_or_vaild_invite! + def check_registrations_open_or_valid_invite! return true if invite.present? unless AppConfig.settings.enable_registrations? flash[:error] = t('registrations.closed') diff --git a/spec/models/person_spec.rb b/spec/models/person_spec.rb index ca74fbd72..8f86b193e 100644 --- a/spec/models/person_spec.rb +++ b/spec/models/person_spec.rb @@ -107,7 +107,7 @@ describe Person do end end - describe "vaild url" do + describe "valid url" do it 'should allow for https urls' do person = FactoryGirl.build(:person, :url => "https://example.com") person.should be_valid diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 1ca106c88..d56bd6932 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -316,7 +316,7 @@ describe User do alice.should_not be_valid end - it "requires a vaild email address" do + it "requires a valid email address" do alice.email = "somebody@anywhere" alice.should_not be_valid end @@ -336,7 +336,7 @@ describe User do alice.should be_valid end - it "requires a vaild unconfirmed_email address" do + it "requires a valid unconfirmed_email address" do alice.unconfirmed_email = "somebody@anywhere" alice.should_not be_valid end