Skip to content
Extraits de code Groupes Projets
Sélectionner une révision Git
  • master par défaut protégée
  • v0.7.17.0-facil
  • v0.7.16.0-facil
3 résultats
Blame Lien permanent
  • danielgrippi's avatar
    60a60733
    Merge branch 'master' into follow · 60a60733
    danielgrippi a rédigé 
    Conflicts:
	app/controllers/aspects_controller.rb
	app/controllers/contacts_controller.rb
	app/controllers/people_controller.rb
	app/controllers/photos_controller.rb
	app/controllers/tags_controller.rb
	app/helpers/notifications_helper.rb
	app/models/notifications/new_request.rb
	app/models/user_preference.rb
	public/javascripts/view.js
	spec/controllers/aspects_controller_spec.rb
	spec/controllers/contacts_controller_spec.rb
	spec/controllers/home_controller_spec.rb
	spec/controllers/post_visibilities_controller_spec.rb
	spec/controllers/requests_controller_spec.rb
	spec/mailers/notifier_spec.rb
	spec/models/user_spec.rb
    60a60733
    Historique
    Merge branch 'master' into follow
    danielgrippi a rédigé 
    Conflicts:
	app/controllers/aspects_controller.rb
	app/controllers/contacts_controller.rb
	app/controllers/people_controller.rb
	app/controllers/photos_controller.rb
	app/controllers/tags_controller.rb
	app/helpers/notifications_helper.rb
	app/models/notifications/new_request.rb
	app/models/user_preference.rb
	public/javascripts/view.js
	spec/controllers/aspects_controller_spec.rb
	spec/controllers/contacts_controller_spec.rb
	spec/controllers/home_controller_spec.rb
	spec/controllers/post_visibilities_controller_spec.rb
	spec/controllers/requests_controller_spec.rb
	spec/mailers/notifier_spec.rb
	spec/models/user_spec.rb
notifications.feature 538 o 
@javascript
Feature: Notifications
  In order to see what is happening
  As a User
  I want to get notifications

Background:
  Given a user with email "bob@bob.bob"
  And a user with email "alice@alice.alice"
  When I sign in as "bob@bob.bob"
  And I am on "alice@alice.alice"'s page

  And I add the person to my 1st aspect

  And I go to the destroy user session page

Scenario: someone shares with me
  When I sign in as "alice@alice.alice"
  And I follow "notifications" in the header

  Then I should see "started sharing with you"