diff --git a/app/models/user.rb b/app/models/user.rb index d83b6baa3..c703083d5 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -270,7 +270,7 @@ def step_3_complete? # A User can also be created by a one of the consumer applications as a stand-in # for a person who has not yet (or may never) created an account. In this case # the User model will be in the "unclaimed" state. When the User does signup, they - # can claim the account and recieve all the permissions and tasks + # can claim the account and receive all the permissions and tasks # that were assigned to it in the interm. # # Once a User model is cleared for use, the state is set to "activated" diff --git a/spec/features/admin/users_spec.rb b/spec/features/admin/users_spec.rb index 6bec4c5c4..34b552179 100644 --- a/spec/features/admin/users_spec.rb +++ b/spec/features/admin/users_spec.rb @@ -35,6 +35,8 @@ context 'popup console' do it 'searches users and does not explode' do visit '/' + wait_for_ajax + wait_for_animations click_link 'Popup Console' wait_for_ajax(10) # for some reason this is slow click_link 'Users' diff --git a/spec/features/remove_accounts_path_prefix_spec.rb b/spec/features/remove_accounts_path_prefix_spec.rb index 197e507f5..873f69887 100644 --- a/spec/features/remove_accounts_path_prefix_spec.rb +++ b/spec/features/remove_accounts_path_prefix_spec.rb @@ -5,7 +5,7 @@ let(:request) { Rack::MockRequest.new(app) } context "Requests should get routed to the appropriate controllers" do - it "should recieve profile info in show page" do + it "should receive profile info in show page" do expect_any_instance_of(Api::V1::UsersController).to receive(:show) request.get("/accounts/api/user") end