Preselect the current issue tracker with selected="selected"

The previous behavior was, that the first element of the select was
preselected, thus upon saving the project, the previous selected could
be overwritten.
parent c27e49e9
...@@ -80,7 +80,7 @@ module ProjectsHelper ...@@ -80,7 +80,7 @@ module ProjectsHelper
@project.milestones.active.order("due_date, title ASC").all @project.milestones.active.order("due_date, title ASC").all
end end
def project_issues_trackers def project_issues_trackers(current_tracker = nil)
values = Project.issues_tracker.values.map do |tracker_key| values = Project.issues_tracker.values.map do |tracker_key|
if tracker_key.to_sym == :gitlab if tracker_key.to_sym == :gitlab
['GitLab', tracker_key] ['GitLab', tracker_key]
...@@ -89,7 +89,7 @@ module ProjectsHelper ...@@ -89,7 +89,7 @@ module ProjectsHelper
end end
end end
options_for_select(values) options_for_select(values, current_tracker)
end end
private private
......
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
- if Project.issues_tracker.values.count > 1 - if Project.issues_tracker.values.count > 1
.control-group .control-group
= f.label :issues_tracker, "Issues tracker", class: 'control-label' = f.label :issues_tracker, "Issues tracker", class: 'control-label'
.controls= f.select(:issues_tracker, project_issues_trackers, {}, { disabled: !@project.issues_enabled }) .controls= f.select(:issues_tracker, project_issues_trackers(@project.issues_tracker), {}, { disabled: !@project.issues_enabled })
.control-group .control-group
= f.label :issues_tracker_id, "Project name or id in issues tracker", class: 'control-label' = f.label :issues_tracker_id, "Project name or id in issues tracker", class: 'control-label'
......
Feature: Project Issue Tracker
Background:
Given I sign in as a user
And I own project "Shop"
And project "Shop" has issues enabled
And I visit project "Shop" page
Scenario: I set the issue tracker to "GitLab"
When I visit edit project "Shop" page
And change the issue tracker to "GitLab"
And I save project
Then I the project should have "GitLab" as issue tracker
Scenario: I set the issue tracker to "Redmine"
When I visit edit project "Shop" page
And change the issue tracker to "Redmine"
And I save project
Then I the project should have "Redmine" as issue tracker
\ No newline at end of file
class ProjectIssueTracker < Spinach::FeatureSteps
include SharedAuthentication
include SharedProject
include SharedPaths
step 'project "Shop" has issues enabled' do
@project = Project.find_by_name "Shop"
@project ||= create(:project_with_code, name: "Shop", namespace: @user.namespace)
@project.issues_enabled = true
end
step 'change the issue tracker to "GitLab"' do
select 'GitLab', from: 'project_issues_tracker'
end
step 'I the project should have "GitLab" as issue tracker' do
find_field('project_issues_tracker').value.should == 'gitlab'
end
step 'change the issue tracker to "Redmine"' do
select 'Redmine', from: 'project_issues_tracker'
end
step 'I the project should have "Redmine" as issue tracker' do
find_field('project_issues_tracker').value.should == 'redmine'
end
And 'I save project' do
click_button 'Save changes'
end
end
...@@ -7,5 +7,17 @@ describe ProjectsHelper do ...@@ -7,5 +7,17 @@ describe ProjectsHelper do
"<option value=\"redmine\">Redmine</option>\n" \ "<option value=\"redmine\">Redmine</option>\n" \
"<option value=\"gitlab\">GitLab</option>" "<option value=\"gitlab\">GitLab</option>"
end end
it "returns the correct issues trackers available with current tracker 'gitlab' selected" do
project_issues_trackers('gitlab').should ==
"<option value=\"redmine\">Redmine</option>\n" \
"<option value=\"gitlab\" selected=\"selected\">GitLab</option>"
end
it "returns the correct issues trackers available with current tracker 'redmine' selected" do
project_issues_trackers('redmine').should ==
"<option value=\"redmine\" selected=\"selected\">Redmine</option>\n" \
"<option value=\"gitlab\">GitLab</option>"
end
end end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment