From: Jiri Tomasek&lt;jtomasek(a)redhat.com&gt; --- src/app/controllers/realms_controller.rb | 4 +- src/app/views/hardware_profiles/_list.haml | 59 +++++++++++--------- .../views/hardware_profiles/_section_header.haml | 5 ++ src/app/views/hardware_profiles/index.haml | 4 +- src/app/views/layouts/_admin_header.haml | 9 +--- src/app/views/pool_families/_list.haml | 50 ++++++++++------- src/app/views/pool_families/_section_header.haml | 5 ++ src/app/views/pool_families/index.haml | 4 +- src/app/views/provider_accounts/_list.haml | 49 ++++++++++------- .../views/provider_accounts/_section_header.haml | 5 ++ src/app/views/provider_accounts/index.haml | 4 +- src/app/views/providers/_list.haml | 46 +++++++++------ src/app/views/providers/_section_header.haml | 5 ++ src/app/views/providers/index.haml | 4 +- src/app/views/providers/show.haml | 20 ++++++- src/app/views/realms/_list.haml | 42 ++++++++------ src/app/views/realms/_section_header.haml | 5 ++ src/app/views/realms/index.haml | 4 +- src/app/views/roles/_list.haml | 53 ++++++++---------- src/app/views/roles/_section_header.haml | 5 ++ src/app/views/roles/index.haml | 4 +- src/app/views/users/_list.haml | 8 +- src/features/pool_family.feature | 2 +- src/features/provider.feature | 4 +- src/features/provider_account.feature | 6 +- src/features/realm.feature | 2 +- src/features/role.feature | 2 +- src/features/step_definitions/realm_steps.rb | 2 +- 28 files changed, 243 insertions(+), 169 deletions(-) create mode 100644 src/app/views/hardware_profiles/_section_header.haml create mode 100644 src/app/views/pool_families/_section_header.haml create mode 100644 src/app/views/provider_accounts/_section_header.haml create mode 100644 src/app/views/providers/_section_header.haml create mode 100644 src/app/views/realms/_section_header.haml create mode 100644 src/app/views/roles/_section_header.haml diff --git a/src/app/controllers/realms_controller.rb b/src/app/controllers/realms_controller.rb index 6225237..9737d9a 100644 --- a/src/app/controllers/realms_controller.rb +++ b/src/app/controllers/realms_controller.rb @@ -49,11 +49,11 @@ class RealmsController< ApplicationController end def multi_destroy - if params[:id].blank? + if params[:realm_selected].blank? flash[:error] = 'You must select at least one realm to delete.' else require_privilege(Privilege::MODIFY, Realm) - FrontendRealm.destroy(params[:id]) + FrontendRealm.destroy(params[:realm_selected]) end redirect_to realms_path end diff --git a/src/app/views/hardware_profiles/_list.haml b/src/app/views/hardware_profiles/_list.haml index bbca7a6..1733cef 100644 --- a/src/app/views/hardware_profiles/_list.haml +++ b/src/app/views/hardware_profiles/_list.haml @@ -1,28 +1,33 @@ -- form_tag do - #object-actions - = link_to "New Hardware Profile", new_hardware_profile_path, :class => 'button' - = restful_submit_tag "Delete", 'destroy', multi_destroy_hardware_profiles_path, 'DELETE', :id => 'delete_button', :class => 'button' - #selections - %p - Select:&nbsp; - = link_to "All", @url_params.merge(:select => 'all') - %span> ,&nbsp; - = link_to "None", @url_params.merge(:select => 'none') +%section.content-section.hardware_profiles + %header + %h2 Hardware Profiles + %span.label.badge.dark.count= @hardware_profiles.length - #list - %table - = sortable_table_header @header - - @hardware_profiles.each do |hwp| - %tr - %td - - selected = @url_params[:select] == 'all' - %input{:name => "hardware_profile_selected[]", :type => "checkbox", :value => hwp.id, :id => "hardware_profile_checkbox_#{hwp.id}", :checked => selected } - = link_to hwp.name, hardware_profile_path(hwp) - %td - =hwp.architecture.to_s - %td - =hwp.memory.to_s - %td - =hwp.storage.to_s - %td - =hwp.cpu.to_s + .content + - form_tag multi_destroy_hardware_profiles_path do + = submit_tag "Delete", :id => 'delete_button', :class => 'button' + %p + Select:&nbsp; + = link_to "All", @url_params.merge(:select => 'all') + %span> ,&nbsp; + = link_to "None", @url_params.merge(:select => 'none') + + %table#hardware_profiles_table + %thead + %tr + %th.ignore + %th= link_to "Hardware Profile Name", hardware_profiles_path(:sort_by => "name") + %th= link_to "Architecture", hardware_profiles_path(:sort_by => "architecture") + %th= link_to "Memory", hardware_profiles_path(:sort_by => "memory") + %th= link_to "Storage", hardware_profiles_path(:sort_by => "storage") + %th= link_to "Virtual CPU", hardware_profiles_path(:sort_by => "cpu") + - @hardware_profiles.each do |hwp| + %tr{:class => cycle('stripe')} + %td + - selected = @url_params[:select] == 'all' + = check_box_tag "hardware_profile_selected[]", hwp.id, selected, :id => "hardware_profile_checkbox_#{hwp.id}" + %td= link_to hwp.name, hardware_profile_path(hwp) + %td= hwp.architecture.to_s + %td= hwp.memory.to_s + %td= hwp.storage.to_s + %td= hwp.cpu.to_s diff --git a/src/app/views/hardware_profiles/_section_header.haml b/src/app/views/hardware_profiles/_section_header.haml new file mode 100644 index 0000000..d5a975e --- /dev/null +++ b/src/app/views/hardware_profiles/_section_header.haml @@ -0,0 +1,5 @@ +%header.page-header + %h1{:class => controller.controller_name} Hardware Profiles + #obj_actions.button-group + = link_to 'New Hardware Profile', new_hardware_profile_url, :class => 'button primary', :id => 'new_hardware_profile_button' + .corner&nbsp; diff --git a/src/app/views/hardware_profiles/index.haml b/src/app/views/hardware_profiles/index.haml index acfa09b..55fac46 100644 --- a/src/app/views/hardware_profiles/index.haml +++ b/src/app/views/hardware_profiles/index.haml @@ -1,3 +1,3 @@ = render :partial => 'layouts/admin_header' -%div#view - = render :partial => 'list' += render :partial => 'section_header' += render :partial => 'list' diff --git a/src/app/views/layouts/_admin_header.haml b/src/app/views/layouts/_admin_header.haml index 3b5c935..19834d5 100644 --- a/src/app/views/layouts/_admin_header.haml +++ b/src/app/views/layouts/_admin_header.haml @@ -18,16 +18,9 @@ %option{:value => pool_families_path} Pool Families %option{:value => settings_path} Settings -- unless controller.controller_name == 'users' - %header.page-header - %h1{:class => controller.controller_name}= controller.controller_name.titlecase - -##obj_actions.button-group - -#= link_to 'New Object', new_object_url, :class => 'button primary', :id => 'new_object_button' - .corner&nbsp; - :javascript $(document).ready(function() { $('select#admin-section-select').change(function() { window.location = $(this).val(); }); - }); \ No newline at end of file + }); diff --git a/src/app/views/pool_families/_list.haml b/src/app/views/pool_families/_list.haml index 1133073..505dcf0 100644 --- a/src/app/views/pool_families/_list.haml +++ b/src/app/views/pool_families/_list.haml @@ -1,23 +1,31 @@ -- form_tag do - = link_to "Create", new_pool_family_path, :class => "button" - = restful_submit_tag "Delete", 'destroy', multi_destroy_pool_families_path, 'DELETE', :id => 'delete_button', :class => 'button' +%section.content-section.pool_families + %header + %h2 Pool Families + %span.label.badge.dark.count= @pool_families.length - %p - Select:&nbsp; - = link_to "All", @url_params.merge(:select => 'all') - %span> ,&nbsp; - = link_to "None", @url_params.merge(:select => 'none') + .content + - form_tag multi_destroy_pool_families_path do + = submit_tag "Delete", :id => 'delete_button', :class => 'button' - %table#pool_families_table - = sortable_table_header @header - - unless @pool_families.blank? - - @pool_families.each do |pool_family| - %tr - %td - - selected = @url_params[:select] == 'all' - %input{:name => "pool_family_selected[]", :type => "checkbox", :value => pool_family.id, :id => "pool_family_checkbox_#{pool_family.id}", :checked => selected } - = link_to pool_family.name, pool_family_path(pool_family) - %td - = pool_family.quota.maximum_running_instances or 'unlimited' - %td - = "#{pool_family.quota.percentage_used} %" + %p + Select:&nbsp; + = link_to "All", @url_params.merge(:select => 'all') + %span> ,&nbsp; + = link_to "None", @url_params.merge(:select => 'none') + + %table#pool_families_table + %thead + %tr + %th.ignore + %th= link_to "Pool Family Name", pool_families_path(:sort_by => "name") + %th= link_to "Quota limit", pool_families_path(:sort_by => "quota") + %th= link_to "Quota currently in use", pool_families_path(:sort_by => "quota") + - unless @pool_families.blank? + - @pool_families.each do |pool_family| + %tr{:class => cycle('stripe')} + %td + - selected = @url_params[:select] == 'all' + = check_box_tag "pool_family_selected[]", pool_family.id, selected, :id => "pool_family_checkbox_#{pool_family.id}" + %td= link_to pool_family.name, pool_family_path(pool_family) + %td= pool_family.quota.maximum_running_instances or 'unlimited' + %td= "#{pool_family.quota.percentage_used} %" diff --git a/src/app/views/pool_families/_section_header.haml b/src/app/views/pool_families/_section_header.haml new file mode 100644 index 0000000..8fb7cf3 --- /dev/null +++ b/src/app/views/pool_families/_section_header.haml @@ -0,0 +1,5 @@ +%header.page-header + %h1{:class => controller.controller_name} Pool Families + #obj_actions.button-group + = link_to 'New Pool Family', new_pool_family_url, :class => 'button primary', :id => 'new_pool_family_button' + .corner&nbsp; diff --git a/src/app/views/pool_families/index.haml b/src/app/views/pool_families/index.haml index acfa09b..55fac46 100644 --- a/src/app/views/pool_families/index.haml +++ b/src/app/views/pool_families/index.haml @@ -1,3 +1,3 @@ = render :partial => 'layouts/admin_header' -%div#view - = render :partial => 'list' += render :partial => 'section_header' += render :partial => 'list' diff --git a/src/app/views/provider_accounts/_list.haml b/src/app/views/provider_accounts/_list.haml index 5f598c8..38e3efa 100644 --- a/src/app/views/provider_accounts/_list.haml +++ b/src/app/views/provider_accounts/_list.haml @@ -1,20 +1,29 @@ -- form_tag do - = link_to "New Account", new_provider_account_path, :class => 'button' - = restful_submit_tag "Delete", "delete", multi_destroy_provider_accounts_path, 'DELETE', :class => 'button' - %p - Select:&nbsp; - = link_to "All", @url_params.merge(:select => 'all') - %span> ,&nbsp; - = link_to "None", @url_params.merge(:select => 'none') - %table - = sortable_table_header @header - - @accounts.each do |account| - %tr - %td - - selected = @url_params[:select] == 'all' - %input{:name => 'accounts_selected[]', :type => 'checkbox', :value => account.id, :id => "account_checkbox_#{account.id}", :checked => selected } - = link_to account.name, provider_account_path(account) - %td - =account.credentials_hash['username'] - %td - =account.provider.provider_type.name +%section.content-section.users + %header + %h2 Provider Accounts + %span.label.badge.dark.count= @accounts.length + + .content + - form_tag multi_destroy_provider_accounts_path do + = submit_tag "Delete", :id => 'delete_button', :class => 'button' + %p + Select:&nbsp; + = link_to "All", @url_params.merge(:select => 'all') + %span> ,&nbsp; + = link_to "None", @url_params.merge(:select => 'none') + + %table#provider_accounts_table + %thead + %tr + %th.ignore + %th= link_to "Provider Account Name", hardware_profiles_path(:sort_by => "name") + %th= link_to "Username", hardware_profiles_path(:sort_by => "name") + %th= link_to "Provider Type", hardware_profiles_path(:sort_by => "name") + - @accounts.each do |account| + %tr + %td + - selected = @url_params[:select] == 'all' + = check_box_tag "accounts_selected[]", account.id, selected, :id => "account_checkbox_#{account.id}" + %td= link_to account.name, provider_account_path(account) + %td= account.credentials_hash['username'] + %td= account.provider.provider_type.name diff --git a/src/app/views/provider_accounts/_section_header.haml b/src/app/views/provider_accounts/_section_header.haml new file mode 100644 index 0000000..5ef520a --- /dev/null +++ b/src/app/views/provider_accounts/_section_header.haml @@ -0,0 +1,5 @@ +%header.page-header + %h1{:class => controller.controller_name} Provider Accounts + #obj_actions.button-group + = link_to 'New Provider Account', new_provider_account_url, :class => 'button primary', :id => 'new_provider_account_button' + .corner&nbsp; diff --git a/src/app/views/provider_accounts/index.haml b/src/app/views/provider_accounts/index.haml index acfa09b..55fac46 100644 --- a/src/app/views/provider_accounts/index.haml +++ b/src/app/views/provider_accounts/index.haml @@ -1,3 +1,3 @@ = render :partial => 'layouts/admin_header' -%div#view - = render :partial => 'list' += render :partial => 'section_header' += render :partial => 'list' diff --git a/src/app/views/providers/_list.haml b/src/app/views/providers/_list.haml index 417b416..efe622e 100644 --- a/src/app/views/providers/_list.haml +++ b/src/app/views/providers/_list.haml @@ -1,20 +1,30 @@ -- form_tag do - = link_to "Create", new_provider_url, :class => "button" - = restful_submit_tag "Delete", 'destroy', multi_destroy_providers_path, 'DELETE', :id => 'delete_button', :class => 'button' +%section.content-section.providers + %header + %h2 Providers + %span.label.badge.dark.count= @providers.length - %p - Select:&nbsp; - = link_to "All", @url_params.merge(:select => 'all') - %span> ,&nbsp; - = link_to "None", @url_params.merge(:select => 'none') + .content + - form_tag multi_destroy_providers_path do + = submit_tag "Delete", :id => 'delete_button', :class => 'button' - %table#providers_table - = sortable_table_header @header - -(a)providers.each do |provider| - %tr - %td - - selected = @url_params[:select] == 'all' - %input{:name => "provider_selected[]", :type => "checkbox", :value => provider.id, :id => "provider_checkbox_#{provider.id}", :checked => selected } - = link_to provider.name, provider_path(provider) - %td= provider.url - %td= provider.provider_type.name + %p + Select:&nbsp; + = link_to "All", @url_params.merge(:select => 'all') + %span> ,&nbsp; + = link_to "None", @url_params.merge(:select => 'none') + + %table#providers_table + %thead + %tr + %th.ignore + %th= link_to "Provider Name", providers_path(:sort_by => "name") + %th= link_to "Provider URL", providers_path(:sort_by => "url") + %th= link_to "Provider Type", providers_path(:sort_by => "type") + - @providers.each do |provider| + %tr{:class => cycle('stripe')} + %td + - selected = @url_params[:select] == 'all' + = check_box_tag "provider_selected[]", provider.id, selected, :id => "provider_checkbox_#{provider.id}" + %td= link_to provider.name, provider_path(provider) + %td= provider.url + %td= provider.provider_type.name diff --git a/src/app/views/providers/_section_header.haml b/src/app/views/providers/_section_header.haml new file mode 100644 index 0000000..b667673 --- /dev/null +++ b/src/app/views/providers/_section_header.haml @@ -0,0 +1,5 @@ +%header.page-header + %h1{:class => controller.controller_name} Providers + #obj_actions.button-group + = link_to 'New Provider', new_provider_url, :class => 'button primary', :id => 'new_provider_button' + .corner&nbsp; diff --git a/src/app/views/providers/index.haml b/src/app/views/providers/index.haml index acfa09b..55fac46 100644 --- a/src/app/views/providers/index.haml +++ b/src/app/views/providers/index.haml @@ -1,3 +1,3 @@ = render :partial => 'layouts/admin_header' -%div#view - = render :partial => 'list' += render :partial => 'section_header' += render :partial => 'list' diff --git a/src/app/views/providers/show.haml b/src/app/views/providers/show.haml index 2eadbfd..c9313a5 100644 --- a/src/app/views/providers/show.haml +++ b/src/app/views/providers/show.haml @@ -1,3 +1,19 @@ = render :partial => 'layouts/admin_header' -%div#view - = render :partial => 'properties' +%header.page-header + %h1{:class => controller.controller_name}= @provider.name + #obj_actions.button-container + = link_to 'New Provider', new_provider_url, :class => 'button primary', :id => 'new_provider_button' + %form.button-group{:action => provider_path(@provider), :method => 'POST'} + = link_to 'Edit', edit_provider_path(@provider), :class => 'button pill' + = link_to "Test", provider_path(@provider, {:test_provider => true}), { :class => 'button' } + %input{:name => "provider_selected[]", :type => "hidden", :value => @provider.id} + = restful_submit_tag('Delete', 'destroy', multi_destroy_providers_path, 'DELETE', :class => "button pill danger") + .corner&nbsp; + +%section.content-section.provider + %header + %h2 Properties + + .content + %div#view + = render :partial => 'properties' diff --git a/src/app/views/realms/_list.haml b/src/app/views/realms/_list.haml index 2803e6a..5617811 100644 --- a/src/app/views/realms/_list.haml +++ b/src/app/views/realms/_list.haml @@ -1,19 +1,27 @@ -- form_tag do - = link_to "Create", new_realm_path, :class => "button" - = restful_submit_tag "Delete", 'destroy', multi_destroy_realms_path, 'DELETE', :id => 'delete_button', :class => 'button' +%section.content-section.realms + %header + %h2 Realms + %span.label.badge.dark.count= @realms.length - %p - Select:&nbsp; - = link_to "All", @url_params.merge(:select => 'all') - %span> ,&nbsp; - = link_to "None", @url_params.merge(:select => 'none') + .content + - form_tag multi_destroy_realms_path do + = submit_tag "Delete", :id => 'delete_button', :class => 'button' - %table#realms_table - = sortable_table_header @header - - unless @realms.blank? - - @realms.each do |realm| - %tr - %td - - selected = @url_params[:select] == 'all' - %input{:name => "id[]", :type => "checkbox", :value => realm.id, :id => "realm_id_#{realm.id}", :checked => selected } - = link_to realm.name, realm_path(realm) + %p + Select:&nbsp; + = link_to "All", @url_params.merge(:select => 'all') + %span> ,&nbsp; + = link_to "None", @url_params.merge(:select => 'none') + + %table#realms_table + %thead + %tr + %th.ignore + %th= link_to "Realm Name", hardware_profiles_path(:sort_by => "name") + - unless @realms.blank? + - @realms.each do |realm| + %tr{:class => cycle('stripe')} + %td + - selected = @url_params[:select] == 'all' + = check_box_tag "realm_selected[]", realm.id, selected, :id => "realm_checkbox_#{realm.id}" + %td= link_to realm.name, realm_path(realm) diff --git a/src/app/views/realms/_section_header.haml b/src/app/views/realms/_section_header.haml new file mode 100644 index 0000000..7230e81 --- /dev/null +++ b/src/app/views/realms/_section_header.haml @@ -0,0 +1,5 @@ +%header.page-header + %h1{:class => controller.controller_name} Realms + #obj_actions.button-group + = link_to 'New Realm', new_realm_url, :class => 'button primary', :id => 'new_realm_button' + .corner&nbsp; diff --git a/src/app/views/realms/index.haml b/src/app/views/realms/index.haml index acfa09b..55fac46 100644 --- a/src/app/views/realms/index.haml +++ b/src/app/views/realms/index.haml @@ -1,3 +1,3 @@ = render :partial => 'layouts/admin_header' -%div#view - = render :partial => 'list' += render :partial => 'section_header' += render :partial => 'list' diff --git a/src/app/views/roles/_list.haml b/src/app/views/roles/_list.haml index 5bd1247..dba11a6 100644 --- a/src/app/views/roles/_list.haml +++ b/src/app/views/roles/_list.haml @@ -1,30 +1,25 @@ -- form_tag do - = link_to "New Role", new_role_path, :class => 'button' - = restful_submit_tag "Destroy", "destroy", multi_destroy_roles_path, 'DELETE', :id => 'delete_button', :class => 'button' - %p - Select:&nbsp; - = link_to "All", @url_params.merge(:select => 'all') - %span> ,&nbsp; - = link_to "None", @url_params.merge(:select => 'none') - %table#roles_table - = sortable_table_header @header - - @roles.each do |role| - %tr - %td - - selected = @url_params[:select] == 'all' - %input{:name => "role_selected[]", :type => "checkbox", :value => role.id, :id => "role_checkbox_#{role.id}", :checked => selected } - = link_to role.name, role_path(role) +%section.content-section.roles + %header + %h2 Roles List + %span.label.badge.dark.count= @roles.length -:javascript - $(document).ready(function () { - $('#delete_button').click(function(e) { - if ($("#roles_table input[@type=radio]:checked").length == 0) { - alert('Please select a role to be deleted before clicking Delete button.'); - e.preventDefault(); - } else { - if (!confirm("Are you sure you want to delete this role?")) { - e.preventDefault(); - } - } - }); - }); + .content + - form_tag multi_destroy_roles_path do + = submit_tag "Delete", :id => 'delete_button', :class => 'button' + %p + Select:&nbsp; + = link_to "All", @url_params.merge(:select => 'all') + %span> ,&nbsp; + = link_to "None", @url_params.merge(:select => 'none') + + %table#roles_table + %thead + %tr + %th.ignore + %th= link_to "Role Name", roles_path(:sort_by => "name") + - @roles.each do |role| + %tr{:class => cycle('stripe')} + %td + - selected = @url_params[:select] == 'all' + = check_box_tag "role_selected[]", role.id, selected, :id => "role_checkbox_#{role.id}" + %td= link_to role.name, role_path(role) diff --git a/src/app/views/roles/_section_header.haml b/src/app/views/roles/_section_header.haml new file mode 100644 index 0000000..8441d22 --- /dev/null +++ b/src/app/views/roles/_section_header.haml @@ -0,0 +1,5 @@ +%header.page-header + %h1{:class => controller.controller_name} Roles + #obj_actions.button-group + = link_to 'New Role', new_role_url, :class => 'button primary', :id => 'new_role_button' + .corner&nbsp; diff --git a/src/app/views/roles/index.haml b/src/app/views/roles/index.haml index acfa09b..55fac46 100644 --- a/src/app/views/roles/index.haml +++ b/src/app/views/roles/index.haml @@ -1,3 +1,3 @@ = render :partial => 'layouts/admin_header' -%div#view - = render :partial => 'list' += render :partial => 'section_header' += render :partial => 'list' diff --git a/src/app/views/users/_list.haml b/src/app/views/users/_list.haml index f7e6475..acee88f 100644 --- a/src/app/views/users/_list.haml +++ b/src/app/views/users/_list.haml @@ -4,8 +4,8 @@ %span.label.badge.dark.count= @users.length .content - - form_tag do - = restful_submit_tag "Delete", 'destroy', multi_destroy_users_path, 'DELETE', :id => 'delete_button', :class => 'button' + - form_tag multi_destroy_users_path do + = submit_tag "Delete", :id => 'delete_button', :class => 'button' %table#users_table %thead @@ -22,7 +22,7 @@ -(a)users.each do |user| %tr{:class => cycle('stripe')} %td - %input{:name => "user_selected[]", :type => "checkbox", :value => user.id, :id => "user_checkbox_#{user.id}" } + = check_box_tag "user_selected[]", user.id, false, :id => "user_checkbox_#{user.id}" %td= link_to user.login, user_path(user) %td= user.last_name %td= user.first_name @@ -42,4 +42,4 @@ } } }); - }); \ No newline at end of file + }); diff --git a/src/features/pool_family.feature b/src/features/pool_family.feature index 010bac9..2954242 100644 --- a/src/features/pool_family.feature +++ b/src/features/pool_family.feature @@ -29,7 +29,7 @@ Feature: Pool Families Scenario: Create a new Pool family Given I am on the pool families page And there is not a pool family named "testpoolfamily" - When I follow "Create" + When I follow "New Pool Family" Then I should be on the new pool family page When I fill in "pool_family[name]" with "testpoolfamily" When I fill in "pool_family[quota_attributes][maximum_running_instances]" with "2" diff --git a/src/features/provider.feature b/src/features/provider.feature index 69ac381..c49379c 100644 --- a/src/features/provider.feature +++ b/src/features/provider.feature @@ -50,7 +50,7 @@ Feature: Manage Providers Scenario: Create a new Provider Given I am on the providers page And there is not a provider named "testprovider" - When I follow "Create" + When I follow "New Provider" Then I should be on the new provider page When I fill in "provider[name]" with "testprovider" And I fill in "provider[url]" with "http://localhost:3001/api" @@ -63,7 +63,7 @@ Feature: Manage Providers Scenario: Create a new Provider failure when using wrong url Given I am on the providers page And there is not a provider named "testprovider" - When I follow "Create" + When I follow "New Provider" Then I should be on the new provider page When I fill in "provider[name]" with "testprovider" And I fill in "provider[url]" with "http://localhost:3010/api" diff --git a/src/features/provider_account.feature b/src/features/provider_account.feature index d5fee06..d25ec0a 100644 --- a/src/features/provider_account.feature +++ b/src/features/provider_account.feature @@ -12,7 +12,7 @@ Feature: Manage Provider Accounts Given I am on the homepage And there is a provider named "testprovider" When I go to the provider accounts page - Then I should see "New Account" + Then I should see "New Provider Account" And there should be no provider accounts Scenario: List providers in XML format @@ -32,7 +32,7 @@ Feature: Manage Provider Accounts Given there is a provider named "testprovider" And there are no provider accounts And I am on the provider accounts page - When I follow "New Account" + When I follow "New Provider Account" Then I should be on the new provider account page And I should see "New Account" When I select "testprovider" from "provider_account_provider_id" @@ -51,7 +51,7 @@ Feature: Manage Provider Accounts Given there is a provider named "testprovider" And there are no provider accounts And I am on the provider accounts page - When I follow "New Account" + When I follow "New Provider Account" Then I should be on the new provider account page And I should see "New Account" When I select "testprovider" from "provider_account_provider_id" diff --git a/src/features/realm.feature b/src/features/realm.feature index 82deec7..5764ae0 100644 --- a/src/features/realm.feature +++ b/src/features/realm.feature @@ -11,7 +11,7 @@ Feature: Manage Realms Scenario: Create new frontend realm Given I am on the realms page - When I follow "Create" + When I follow "New Realm" Then I should see "Create a new Realm" When I fill in "frontend_realm[name]" with "testrealm2" And I press "Save" diff --git a/src/features/role.feature b/src/features/role.feature index 6ce367e..47ca082 100644 --- a/src/features/role.feature +++ b/src/features/role.feature @@ -37,7 +37,7 @@ Feature: Manage Roles And there are 2 more roles When I check "Admiral" role And I check "Captain" role - And I press "Destroy" + And I press "Delete" Then there should be 0 more roles And I should be on the roles page And I should not see "Captain" diff --git a/src/features/step_definitions/realm_steps.rb b/src/features/step_definitions/realm_steps.rb index 5462c2c..3c305b5 100644 --- a/src/features/step_definitions/realm_steps.rb +++ b/src/features/step_definitions/realm_steps.rb @@ -20,7 +20,7 @@ end When /^(?:|I )check "([^"]*)" realm$/ do |realm_name| realm = FrontendRealm.find_by_name(realm_name) - check("realm_id_#{realm.id}") + check("realm_checkbox_#{realm.id}") end Then /^there should be only (\d+) realms$/ do |number|