diff --git a/app/views/devise/registrations/new.html.haml b/app/views/devise/registrations/new.html.haml index 70526ce..6d4c8de 100644 --- a/app/views/devise/registrations/new.html.haml +++ b/app/views/devise/registrations/new.html.haml @@ -25,7 +25,7 @@ %br/ %label When were you born? - = date_select :user, :birthdate + = date_select :user, :birthdate, start_year: 75.years.ago.year %em If you are less than 13 years old, you must have you parent's permission, and use your parent's email address. diff --git a/app/views/pages/_navigation.html.erb b/app/views/pages/_navigation.html.erb index e699ddc..8b04194 100644 --- a/app/views/pages/_navigation.html.erb +++ b/app/views/pages/_navigation.html.erb @@ -8,10 +8,7 @@ Home > Profile - Projects - Courses - Assignments - (Announcements) - (Collaborators) + Projects + Courses diff --git a/features/prettyurl.feature b/features/prettyurl.feature new file mode 100644 index 0000000..d84af93 --- /dev/null +++ b/features/prettyurl.feature @@ -0,0 +1,18 @@ +Feature: Project Submission + As a student + So that I can complete assignments + I should be able to submit projects for an assignment + + As a teacher + So that I can grade students + I should be able to see projects they've submitted + +Background: + + Given the following users exist: + |id | username | email | password | password_confirmation | + | 300 | beatrice | beatrice@cal.edu | password | password | + +Scenario: Browse to the pretty url + When I go to the url "/@/beatrice" + Then I should be on the profile page of "beatrice" \ No newline at end of file diff --git a/features/step_definitions/dashboard.rb b/features/step_definitions/dashboard.rb index f313788..0ef890f 100644 --- a/features/step_definitions/dashboard.rb +++ b/features/step_definitions/dashboard.rb @@ -62,7 +62,4 @@ page.should have_content "Profile" page.should have_content "Projects" page.should have_content "Courses" - page.should have_content "Assignments" - page.should have_content "Announcements" - page.should have_content "Collaborators" end \ No newline at end of file