From ac93c0a99e2dc30eb93f88b20ad1863e681c6b82 Mon Sep 17 00:00:00 2001 From: Christoph Matthies Date: Tue, 26 Mar 2019 09:45:46 +0100 Subject: [PATCH 1/6] Fix(Footer): Less HTML --- app/views/application/_footer.html.erb | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/app/views/application/_footer.html.erb b/app/views/application/_footer.html.erb index 71df46c9..856d795d 100644 --- a/app/views/application/_footer.html.erb +++ b/app/views/application/_footer.html.erb @@ -1,17 +1,9 @@ -
-
-
-
-

- More Information -

-

© - <%= " " %> - <%= link_to "HPI Enterprise Platform and Integration Concepts", 'https://hpi.de/plattner/home.html' %> - <%= ' - ' %> - <%= link_to "Legal Notice", 'https://hpi.de/en/impressum.html' %> -

-
-
+
+
+ © + <%= link_to "HPI Enterprise Platform and Integration Concepts", 'https://hpi.de/plattner/home.html' %> + - + <%= link_to "Legal Notice", 'https://hpi.de/en/impressum.html' %>
-
+ + From c3da83fc7a87c65cfd8da1195f5cf1f8ff82b387 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Daase?= Date: Wed, 3 Apr 2019 09:10:12 +0200 Subject: [PATCH 2/6] Refactoor requests show page --- app/views/requests/show.html.erb | 159 ++++++++++++++++--------------- 1 file changed, 81 insertions(+), 78 deletions(-) diff --git a/app/views/requests/show.html.erb b/app/views/requests/show.html.erb index 99487255..07fb7cb9 100644 --- a/app/views/requests/show.html.erb +++ b/app/views/requests/show.html.erb @@ -2,91 +2,94 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <% if @request.rejected? %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - +

<%= @request.rejection_information %>

+ <% end %>
VM Name<%= @request.name %>
CPU cores<%= @request.cpu_cores %>
RAM in GB<%= @request.ram_gb %>
Storage in GB<%= @request.storage_gb %>
Operating System<%= @request.operating_system %>
Port<%= @request.port %>
Application Name<%= @request.application_name %>
Description<%= @request.description %>
Comment<%= @request.comment %>
Status<%= @request.status %>
Responsible users + <% @request.responsible_users.each do |user| %> +

<%= user.email %>

+ <% end %> +
Users with sudo rights + <% @request.sudo_user_assignments.each do |assignment| %> +

<%= assignment.user.email %>

+ <% end %> +
Users + <% @request.non_sudo_user_assignments.each do |assignment| %> +

<%= assignment.user.email %>

+ <% end %> +
VM Name<%= @request.name %>
CPU cores<%= @request.cpu_cores %>
RAM in GB:<%= @request.ram_gb %>
Storage in GB:<%= @request.storage_gb %>
Operating System<%= @request.operating_system %>
Port<%= @request.port %>
Application Name<%= @request.application_name %>
Description<%= @request.description %>
Comment<%= @request.comment %>
Status<%= @request.status %>
Responsible usersRejection Information - <% @request.responsible_users.each do |user| %> -

<%= user.email %>

- <% end %> -
Users with sudo rights - <% @request.sudo_user_assignments.each do |assignment| %> -

<%= assignment.user.email %>

- <% end %> -
Users - <% @request.non_sudo_user_assignments.each do |assignment| %> -

<%= assignment.user.email %>

- <% end %> -
-<% if @request.rejected? %> -

- Rejection Information: - <%= @request.rejection_information %> -

-<% end %> <%= link_to 'Back', requests_path, class: "btn btn-secondary" %> \ No newline at end of file From 334b3312e329524ca0b21d00cffda74c09551b4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Daase?= Date: Wed, 3 Apr 2019 09:57:55 +0200 Subject: [PATCH 3/6] Fix tests --- spec/features/requests/accept_reject_request_spec.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spec/features/requests/accept_reject_request_spec.rb b/spec/features/requests/accept_reject_request_spec.rb index 1d2f384e..cd740740 100644 --- a/spec/features/requests/accept_reject_request_spec.rb +++ b/spec/features/requests/accept_reject_request_spec.rb @@ -36,17 +36,17 @@ context 'with a filled in rejection information field' do before do - page.fill_in 'request[rejection_information]', with: 'Info' + page.fill_in 'request[rejection_information]', with: 'A rejection information' click_button('rejectButton') end it 'saves the rejection information' do request.reload - expect(request.rejection_information).to eq('Info') + expect(request.rejection_information).to eq('A rejection information') end - it 'shows rejection information' do - expect(page).to have_text('Info') + it 'redirects to the requests path' do + expect(page).to have_current_path(requests_path) end end end From 34d7caf3b3a4105da758a828175119c4604e7657 Mon Sep 17 00:00:00 2001 From: Christoph Matthies Date: Wed, 3 Apr 2019 10:32:04 +0200 Subject: [PATCH 4/6] Refactor(Accept Reject Request Spec): Add variable --- spec/features/requests/accept_reject_request_spec.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/spec/features/requests/accept_reject_request_spec.rb b/spec/features/requests/accept_reject_request_spec.rb index cd740740..46aa9295 100644 --- a/spec/features/requests/accept_reject_request_spec.rb +++ b/spec/features/requests/accept_reject_request_spec.rb @@ -36,13 +36,14 @@ context 'with a filled in rejection information field' do before do - page.fill_in 'request[rejection_information]', with: 'A rejection information' + @rejection_info = 'a reason why the VM request was rejected' + page.fill_in 'request[rejection_information]', with: @rejection_info click_button('rejectButton') end it 'saves the rejection information' do request.reload - expect(request.rejection_information).to eq('A rejection information') + expect(request.rejection_information).to eq(@rejection_info) end it 'redirects to the requests path' do From ecb29baf6dbd2e33f4a6af055ebc6247ee7e6d96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Daase?= Date: Fri, 12 Apr 2019 10:06:54 +0200 Subject: [PATCH 5/6] Add, currently failing, test for rejecting requests --- spec/features/requests/accept_reject_request_spec.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/spec/features/requests/accept_reject_request_spec.rb b/spec/features/requests/accept_reject_request_spec.rb index 46aa9295..70f73a43 100644 --- a/spec/features/requests/accept_reject_request_spec.rb +++ b/spec/features/requests/accept_reject_request_spec.rb @@ -46,6 +46,11 @@ expect(request.rejection_information).to eq(@rejection_info) end + it 'shows the rejection information' do + request.reload + expect(page).to have_text(@rejection_info) + end + it 'redirects to the requests path' do expect(page).to have_current_path(requests_path) end From 98efdbf4bbaac8886704becf02a070ed0539c275 Mon Sep 17 00:00:00 2001 From: Leon Matthes Date: Fri, 12 Apr 2019 10:25:37 +0200 Subject: [PATCH 6/6] Use correct html class for project selection This fixes the tab order MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Björn Daase --- app/views/requests/_form.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/requests/_form.html.erb b/app/views/requests/_form.html.erb index c0559aa4..7d8c5116 100644 --- a/app/views/requests/_form.html.erb +++ b/app/views/requests/_form.html.erb @@ -16,7 +16,7 @@ <%# form.collection_select(method, collection, value_method, text_method, options = {}, html_options = {}) %> <%= form.collection_select :project_id, Project.all, :id, :name, options = {selected: form.object.project_id, include_blank: t('blank_text'), label: 'Project *'}, - html_options = {class: 'selecttwo'} %> + html_options = {} %> <%= form.collection_select :responsible_user_ids, User.all, :id, :human_readable_identifier, options = {selected: @request.responsible_users.collect(&:id), label: 'Responsible Users *',