From e9aee38974dd916b9dc81b785b05eb8300b0b3d1 Mon Sep 17 00:00:00 2001 From: Enjia Xu Date: Mon, 22 Feb 2021 03:43:04 -0800 Subject: [PATCH 1/2] [fix] fixed user page to display 'GitHub Username' --- app/views/users/index.html.haml | 6 +++--- app/views/users/show.html.haml | 4 ++-- features/user_view.feature | 4 +++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/views/users/index.html.haml b/app/views/users/index.html.haml index 290b3e44..78768fb3 100644 --- a/app/views/users/index.html.haml +++ b/app/views/users/index.html.haml @@ -14,12 +14,12 @@ - else %li{:class=>'each_page'} %a{:class=>"page-link", :href=>"?user_each_page=#{num_per_page}"}=num_per_page - + %ul{:class => 'pagination pull-right'} - ["First","Previous","Current","Next","Last"].each do |action| - if action != "Current" then %li{:class=>'page_num'} - %a{:class=>"page-link", :href=>"?user_page_action=#{action}&prev=#{@page_num}"}=action + %a{:class=>"page-link", :href=>"?user_page_action=#{action}&prev=#{@page_num}"}=action - else %li{:class=>"page-num"} %a{:class=>'page_link'} Page #{[1,@page_num].max} @@ -29,7 +29,7 @@ %tr %th Name %th Email - %th GitHub username + %th GitHub Username %th Type %th SID %th diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index abad05f7..1d0d08ec 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -17,7 +17,7 @@ %strong Email: = @user.email %li - %strong Github User ID: + %strong GitHub Username: = @user.github_uid %li %strong Preferred Contact: @@ -32,4 +32,4 @@ %h1 Engagements %span.help-block This user is participating in the following Engagement(s): -= render partial: 'engagements/index', locals: {engagements: @user.participating_engagements} \ No newline at end of file += render partial: 'engagements/index', locals: {engagements: @user.participating_engagements} diff --git a/features/user_view.feature b/features/user_view.feature index fc8109b8..7fa746bb 100644 --- a/features/user_view.feature +++ b/features/user_view.feature @@ -32,6 +32,7 @@ Scenario: User view displays the correct names Given I am on the Users page Then I should see "Joe Deatrick" And I should see "Armando Fox" + And I should see "GitHub Username" And I should not see "Jackson Murphy" # Story ID: 153070288 @@ -48,6 +49,7 @@ Scenario: The User profile page should have the correct information And I should see "2017-11-02" And I should see "178" And I should see "Armando Fox" + And I should see "GitHub Username" And I should not see "ACElab" And I should not see "Teamscope" - + And I should not see "Github ID" From ac76b5032dfe5ade76a5fc1041994145b2512806 Mon Sep 17 00:00:00 2001 From: Enjia Xu Date: Wed, 24 Feb 2021 16:02:54 -0800 Subject: [PATCH 2/2] [fix] changed all edit/create page to display 'GitHub Username' instead of 'Github Uid' --- app/views/creation/new.html.haml | 2 +- app/views/users/_form.html.haml | 2 +- features/clear_form.feature | 8 ++++---- features/create.feature | 2 +- features/create_user.feature | 4 +--- features/edit_user.feature | 4 +--- features/type_users.feature | 6 +++--- 7 files changed, 12 insertions(+), 16 deletions(-) diff --git a/app/views/creation/new.html.haml b/app/views/creation/new.html.haml index 4f8799b3..f79b1914 100644 --- a/app/views/creation/new.html.haml +++ b/app/views/creation/new.html.haml @@ -12,7 +12,7 @@ = user_form.text_field :name, label: 'User Name' = user_form.email_field :email, label: 'Email' = user_form.phone_field :preferred_contact, label: 'Preferred Contact' - = user_form.text_field :github_uid, label: 'Github Uid' + = user_form.text_field :github_uid, label: 'GitHub Username' = user_form.collection_select :user_type, User.user_types, :first, ->(x){x.first.humanize}, {label: 'User Type'}, {class: 'select2'} = user_form.text_field :sid, label: 'SID' %fieldset.col-sm-4 diff --git a/app/views/users/_form.html.haml b/app/views/users/_form.html.haml index f78aecd2..c36c3f89 100644 --- a/app/views/users/_form.html.haml +++ b/app/views/users/_form.html.haml @@ -4,7 +4,7 @@ = f.text_field :name, label: 'User Name' = f.email_field :email, label: 'Email' = f.phone_field :preferred_contact, label: 'Preferred Contact' - = f.text_field :github_uid, label: 'Github Uid' + = f.text_field :github_uid, label: 'GitHub Username' = f.collection_select :user_type, User.user_types, :first, ->(x) { x.first.humanize }, {label: 'User Type'}, {class: 'select2'} = f.text_field :sid, label: 'SID' = f.file_field :profile_picture, label: 'Profile Picture' diff --git a/features/clear_form.feature b/features/clear_form.feature index ad81578c..95d09607 100644 --- a/features/clear_form.feature +++ b/features/clear_form.feature @@ -81,7 +81,7 @@ Scenario: user can reset a form for New User And I fill in "User Name" with "user" And I fill in "Email" with "user@user.com" And I fill in "Preferred Contact" with "1234567890" - And I fill in "Github Uid" with "dave_id" + And I fill in "GitHub Username" with "dave_id" And I select "Coach" from "User Type" And I fill in "SID" with "123123123" And I press "Reset" @@ -95,7 +95,7 @@ Scenario: user can reset a form for Create New User, Org, and App When I fill in "User Name" with "user" And I fill in "Email" with "user@user.com" And I fill in "Preferred Contact" with "1234567890" - And I fill in "Github Uid" with "dave_id" + And I fill in "GitHub Username" with "dave_id" And I select "Coach" from "User Type" And I fill in "SID" with "123123123" And I fill in "Organization Name" with "myNewOrg" @@ -187,12 +187,12 @@ Scenario: user can reset a form for Edit User Given I am on the edit user page for user id: "2" When I fill in "User Name" with "Fox Armando" And I fill in "Email" with "afox@berkeley.edu" - And I fill in "Github Uid" with "afox" + And I fill in "GitHub Username" with "afox" And I select "Coach" from "User Type" And I press "Reset" Then I should have filled in "Armando Fox" for "User Name" And I should have filled in "armandofox@berkeley.edu" for "Email" - And I should have filled in "armandofox" for "Github Uid" + And I should have filled in "armandofox" for "GitHub Username" And the "User Type" field should contain "coach" # Story ID: 153070009 diff --git a/features/create.feature b/features/create.feature index 704957d9..c9f0db67 100644 --- a/features/create.feature +++ b/features/create.feature @@ -57,7 +57,7 @@ Scenario: User can submit successfully if form is complete | User Name | Fakeuser | | Email | fakeuser@berkeley.edu | | Preferred Contact | 555-555-5555 | - | Github Uid | fakegithubuid | + | GitHub Username | fakegithubuid | And I fill in the "Org Information" fields as follows: | field | value | | Organization Name | Group 20 | diff --git a/features/create_user.feature b/features/create_user.feature index 8e103778..1266d1cc 100644 --- a/features/create_user.feature +++ b/features/create_user.feature @@ -31,7 +31,7 @@ Scenario: There is a form on users page that I can use to create a user And I should see "User Name" And I should see "Email" And I should see "Preferred Contact" - And I should see "Github Uid" + And I should see "GitHub Username" Scenario: I can create a user Given I am on the new user page @@ -68,5 +68,3 @@ Scenario: When I click back I go back to the users page Given I am on the new user page And I follow "Back" Then I am on the users page - - diff --git a/features/edit_user.feature b/features/edit_user.feature index 3aaae079..c4fcda50 100644 --- a/features/edit_user.feature +++ b/features/edit_user.feature @@ -19,7 +19,7 @@ Scenario: There is a form on the edit user page And I should see "User Name" And I should see "Email" And I should see "Preferred Contact" - And I should see "Github Uid" + And I should see "GitHub Username" Scenario: I can edit a user And I fill in the "Edit User" fields as follows: @@ -54,5 +54,3 @@ Scenario: I cannot submit with user name field blank Scenario: When I click back I go back to the users page And I follow "Back" Then I am on the users page - - diff --git a/features/type_users.feature b/features/type_users.feature index ba41a3ce..391b8d5e 100644 --- a/features/type_users.feature +++ b/features/type_users.feature @@ -93,7 +93,7 @@ Scenario: User can submit a create form that includes user type and SID for Stud | User Name | Fakeuser | | Email | fakeuser@berkeley.edu | | Preferred Contact | 555-555-5555 | - | Github Uid | fakegithubuid | + | GitHub Username | fakegithubuid | | User Type | Student | | SID | 11111111 | And I fill in the "Org Information" fields as follows: @@ -123,7 +123,7 @@ Scenario: User can submit a create form that includes user type and SID for Staf | User Name | Professor | | Email | professor@berkeley.edu | | Preferred Contact | 555-555-5555 | - | Github Uid | fakegithubuid | + | GitHub Username | fakegithubuid | | User Type | Staff | | SID | 222222 | And I fill in the "Org Information" fields as follows: @@ -143,4 +143,4 @@ Scenario: User can submit a create form that includes user type and SID for Staf | Code Climate Url | Fake app codeclimate url | And I press "Submit" Then I should be on the app details page for "Fake app" - Then I should see "User, Org, and App were successfully created" \ No newline at end of file + Then I should see "User, Org, and App were successfully created"