Fix mobile sign up with invitation
This commit is contained in:
parent
8ab6f31e0a
commit
be175e969e
5 changed files with 23 additions and 6 deletions
|
|
@ -985,6 +985,10 @@ select#user_language, #user_auto_follow_back_aspect_id, #aspect_ids_ {
|
||||||
color: inherit;
|
color: inherit;
|
||||||
background-color: $background-grey;
|
background-color: $background-grey;
|
||||||
border-radius: 10px;
|
border-radius: 10px;
|
||||||
|
.img .avatar {
|
||||||
|
width: 50px;
|
||||||
|
height: 50px;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.search-mobile {
|
.search-mobile {
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
.well
|
.well
|
||||||
= t('.invited_by')
|
= t('.invited_by')
|
||||||
.media
|
.media
|
||||||
.float-right
|
.pull-right
|
||||||
= aspect_membership_dropdown(contact, inviter, false)
|
= aspect_membership_dropdown(contact, inviter, false)
|
||||||
= person_image_link(inviter, :class => 'img')
|
= person_image_link(inviter, :size => :thumb_small, :class => 'img')
|
||||||
.bd
|
.bd
|
||||||
= person_link(inviter)
|
= person_link(inviter)
|
||||||
|
|
@ -43,6 +43,8 @@
|
||||||
- if AppConfig.settings.captcha.enable?
|
- if AppConfig.settings.captcha.enable?
|
||||||
= show_simple_captcha(:object => 'user', :code_type => 'numeric')
|
= show_simple_captcha(:object => 'user', :code_type => 'numeric')
|
||||||
|
|
||||||
|
= invite_hidden_tag(invite)
|
||||||
|
|
||||||
- if AppConfig.settings.terms.enable?
|
- if AppConfig.settings.terms.enable?
|
||||||
= t('registrations.new.terms', terms_link: link_to(t('registrations.new.terms_link'), terms_path, target: "_blank")).html_safe
|
= t('registrations.new.terms', terms_link: link_to(t('registrations.new.terms_link'), terms_path, target: "_blank")).html_safe
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,6 @@ Feature: Invitations
|
||||||
|
|
||||||
Scenario: Accepting an invitation
|
Scenario: Accepting an invitation
|
||||||
When I visit alice's invitation code url
|
When I visit alice's invitation code url
|
||||||
# Then I should see the "alice is excited" message
|
|
||||||
When I fill in the new user form
|
When I fill in the new user form
|
||||||
And I press "Sign up"
|
And I press "Sign up"
|
||||||
Then I should see the "welcome to diaspora" message
|
Then I should see the "welcome to diaspora" message
|
||||||
|
|
|
||||||
12
features/mobile/invitations.feature
Normal file
12
features/mobile/invitations.feature
Normal file
|
|
@ -0,0 +1,12 @@
|
||||||
|
@javascript
|
||||||
|
Feature: Invitations
|
||||||
|
|
||||||
|
Background:
|
||||||
|
Given I toggle the mobile view
|
||||||
|
|
||||||
|
Scenario: Accepting an invitation
|
||||||
|
When I visit alice's invitation code url
|
||||||
|
When I fill in the new user form
|
||||||
|
And I press "Create my account!"
|
||||||
|
Then I should see the "welcome to diaspora" message
|
||||||
|
And I should be able to friend Alice
|
||||||
Loading…
Reference in a new issue