From: Tomas Sedovic <[email protected]>
This fixes the authentication features and partly the pools.
Some failures still remain, because the appropriate pages have not been
finalized yet and operate on AJAX-only, which Cucumber doesn't see.
---
src/app/views/instance/_instances.haml | 2 +-
src/features/authentication.feature | 8 ++++----
src/features/pool.feature | 4 ++--
src/features/support/hooks.rb | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/app/views/instance/_instances.haml
b/src/app/views/instance/_instances.haml
index b0f4692..5af1838 100644
--- a/src/app/views/instance/_instances.haml
+++ b/src/app/views/instance/_instances.haml
@@ -10,7 +10,7 @@
- opts = { :order => @order,
:order_dir => @order_dir,
- :title => 'List of instances',
+ :title => "Instances for #[email protected]}",
:check_all => 'id' }
= paginated_table('instances_table', columns, @instances, opts) do |rec|
diff --git a/src/features/authentication.feature
b/src/features/authentication.feature
index e6e0545..03ee914 100644
--- a/src/features/authentication.feature
+++ b/src/features/authentication.feature
@@ -15,7 +15,7 @@ Feature: User authentication
| Confirm password | secret |
| First name | Joe |
| Last name | Tester |
- | Email | [email protected] |
+ | E-mail | [email protected] |
And I press "Create Account"
Then I should be on testuser's user page
And I should see "User registered!"
@@ -39,9 +39,9 @@ Feature: User authentication
And I am on the homepage
When I want to edit my profile
And I follow "Edit"
- Then I should see "Edit my profile"
- When I fill in "email" with "[email protected]"
- And I press "Update"
+ Then I should see "Edit an Account"
+ When I fill in "E-mail" with "[email protected]"
+ And I press "Make Changes"
Then I should be on the account page
And I should see "User updated!"
diff --git a/src/features/pool.feature b/src/features/pool.feature
index 31131dd..15abe09 100644
--- a/src/features/pool.feature
+++ b/src/features/pool.feature
@@ -8,9 +8,9 @@ Feature: Manage Pools
And I am logged in
Scenario: Create a new Pool
- Given I am on the instances page
+ Given I am on the pools page
And there is not a pool named "mockpool"
- When I follow "Add a pool"
+ When I follow "New pool"
Then I should be on the new pool page
And I should see "Create a new Pool"
When I fill in "pool_name" with "mockpool"
diff --git a/src/features/support/hooks.rb b/src/features/support/hooks.rb
index 48554aa..3f112ae 100644
--- a/src/features/support/hooks.rb
+++ b/src/features/support/hooks.rb
@@ -7,7 +7,7 @@ Before do
:value =>
@default_quota,
:object_type =>
"Quota")
- @default_pool = Factory(:pool, :name => "default_pool")
+ @default_pool = Factory(:pool, :name => "default_pool", :quota =>
@default_quota)
@self_service_default_pool = Factory(:metadata_object, :key =>
"self_service_default_pool",
:value =>
@default_pool,
:object_type => "Pool")
--
1.7.2.3
_______________________________________________
deltacloud-devel mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/deltacloud-devel
