Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

RSC Can Add Another RSC to manage assignments #3

Merged
merged 59 commits into from
Nov 2, 2018
Merged

RSC Can Add Another RSC to manage assignments #3

merged 59 commits into from
Nov 2, 2018

Conversation

angiecstn
Copy link
Collaborator

@angiecstn angiecstn commented Oct 31, 2018 •
edited
Loading

PT Link

https://www.pivotaltracker.com/story/show/161620321

Included in PR

  • Added devise gem
  • generated login views with devise
  • configure User model
  • added user controller with a create action that allows current user to add a new user
  • Feature test using FactoryBot with 3 scenarios(including sad paths)
  • Adding view for login/signup page
  • Adding links to dashboard leading to login

Screenshots

screenshot 2018-11-01 at 15 47 35

screenshot 2018-11-01 at 15 47 04

screenshot 2018-11-01 at 15 48 47

RhonGabriel and others added 24 commits October 31, 2018 14:41
@RhonGabriel
Added feature file with initial draft of test
2849b0b
@angiecstn
adding sad paths for RSC registration
41b027b
@RhonGabriel
added step definitions files
837e7fc
@angiecstn
adding devise gem and bundling
7ba5d7c
@angiecstn
generating devise, modifying application.html.haml to include alert, …
1971ce0 
…notice and error
@RhonGabriel
added user model and run db:migrate
790bc02
@angiecstn
creating credentials for factory, modifying feature story based on a…
a813f96 
… change of requirements
@RhonGabriel
tested registered rsc user using factory bot
f441318
@angiecstn
adding warden helpers to test a logged in user
aaeada6
@angiecstn
adding test for landing page
53443a3
@RhonGabriel
generate user controller with new and create action
c306ef3
@RhonGabriel
modified feature test to rename landing page, modified routes
66d8868
@angiecstn
adding create in routes and adding create action, adding form in view
8418ec9
@angiecstn
changing routes and actions
898edc0
@RhonGabriel
change params
5583ce1
@RhonGabriel
modified model user to include a creation of automatic password
c7dcfb9
@angiecstn
modifying create action, permission issue
8797a01
@RhonGabriel
modified message when user is created, modified feature test
3cc25d3
@RhonGabriel
modified create action to redirect message to root_path
309abb3
@RhonGabriel
added sad path to feature test with invalid email or password
7f60379
@RhonGabriel
added sad path with invalid email
c10db52
@RhonGabriel
added new scenario with invalid email or password for a registered rsc
c498a94
@rupertlion
Adding message and test show that current user is still first RSC
47a132b
@RhonGabriel
modified user story and feature title
df9c5d2
@coveralls
Copy link

coveralls commented Nov 1, 2018 •
edited
Loading

Pull Request Test Coverage Report for Build 30

  • 13 of 13 (100.0%) changed or added relevant lines in 2 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage increased (+11.4%) to 70.213%
Totals Coverage Status
Change from base Build 12: 11.4%
Covered Lines: 33
Relevant Lines: 47
💛 - Coveralls

rupertlion
rupertlion reviewed Nov 2, 2018
View reviewed changes
config/routes.rb Outdated Show resolved Hide resolved
RhonGabriel and others added 18 commits November 2, 2018 11:25
@RhonGabriel
indented resources to align with other codes in routes
99f4617
@rupertlion
Adding link to create new RSC in header, refactoring tests and steps
6f3b130
@rupertlion
Adding login/logout/register buttons to header partial
fbe070d
@rupertlion
Updating routes and feature tests for landing page and getting to RSC…
94eb808 
… account register
@rupertlion
Adding home link to RSC Dashboard text
49dcff4
@rupertlion
Solving merge conflicts, more to review
318e57d
@rupertlion
Updating feature tests on merge
ceb1d06
@rupertlion
Migrating DB
5ed026d
@RhonGabriel
fix staffing company button from the side navbar
37be610
@RhonGabriel
pull from upstream to include gem loofah
fbda59a
@RhonGabriel
fixed styling on landing page, placed to correct grid
61a34ac
@RhonGabriel
added grid in header
0695009
@RhonGabriel
delete edit view from devise
c8d0f9e
@RhonGabriel
fixed double button on side navbar
97054f5
@angiecstn
remove sidebar element from layout view
6d94c48
@angiecstn
fixing ambigous matches
49d7ca2
@angiecstn
Fixing merge conflicts
b0b2187
@angiecstn
fixing sidebar buttons
e7ef61b
tochman
tochman approved these changes Nov 2, 2018
View reviewed changes
Copy link
Member

@tochman tochman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay. But you have messed up the git flow (see the other branch) You CAN NOT pull from each other to different branches.

@angiecstn angiecstn changed the title [WIP] RSC Can Add Another RSC to manage assignments RSC Can Add Another RSC to manage assignments Nov 2, 2018
@tochman tochman merged commit cdd5c14 into CraftAcademy:development Nov 2, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@RhonGabriel RhonGabriel RhonGabriel approved these changes

@Noelryn Noelryn Noelryn left review comments

@rupertlion rupertlion rupertlion left review comments

@tochman tochman tochman approved these changes

@Prozak8 Prozak8 Awaiting requested review from Prozak8

@magnus-thor magnus-thor Awaiting requested review from magnus-thor

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@angiecstn @coveralls @tochman @rupertlion @Noelryn @RhonGabriel