Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Milan
diaspora
Commits
58bc4f73
Commit
58bc4f73
authored
Jan 31, 2011
by
Dan Goldenberg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed the viewing a requests profile scenario
parent
9e7f0323
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
features/manages_contact_requests.feature
features/manages_contact_requests.feature
+4
-4
features/step_definitions/custom_web_steps.rb
features/step_definitions/custom_web_steps.rb
+1
-1
features/support/paths.rb
features/support/paths.rb
+1
-1
No files found.
features/manages_contact_requests.feature
View file @
58bc4f73
...
...
@@ -13,13 +13,13 @@ Feature: managing contact requests
Then
I should see
"new request!"
@javascript
Scenario
:
viewing a request
'
s profile
Scenario
:
viewing a requests profile
When
I am on the aspects manage page
Then
I should see
"1"
within
"#notification_badge"
When
I click on the contact request
And
I wait for the request
'
s profile page to load
Then
I should be on the requestor
'
s profile
page
And
I should see
"
You have an incoming request from this person
"
And
I wait for the request
or
s profile page to load
Then
I should be on the requestors profile
And
I should see
"
wants to share with you
"
@javascript
Scenario
:
accepting a contact request
...
...
features/step_definitions/custom_web_steps.rb
View file @
58bc4f73
...
...
@@ -51,7 +51,7 @@ When /^I wait for the aspects page to load$/ do
wait_until
{
current_path
==
aspects_path
}
end
When
/^I wait for the request
'
s profile page to load$/
do
When
/^I wait for the request
or
s profile page to load$/
do
wait_until
{
current_path
==
person_path
(
Request
.
where
(
:recipient_id
=>
@me
.
person
.
id
).
first
.
sender
)
}
end
...
...
features/support/paths.rb
View file @
58bc4f73
...
...
@@ -11,7 +11,7 @@ module NavigationHelpers
edit_person_path
(
@me
.
person
)
when
/^my acceptance form page$/
accept_user_invitation_path
(
:invitation_token
=>
@me
.
invitation_token
)
when
/^the requestor
'
s profile
page
$/
when
/^the requestors profile$/
person_path
(
Request
.
where
(
:recipient_id
=>
@me
.
person
.
id
).
first
.
sender
)
when
/^"([^\"]*)"'s page$/
person_path
(
User
.
find_by_email
(
$1
).
person
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment