Merge pull request #655 from brandedcrate/features/extract_issue_tracker-one_issue_button

have only one 'create issue' button

Merge pull request #655 from brandedcrate/features/extract_issue_tracker-one_issue_button
have only one 'create issue' button
Stephen Crosby
2 parents 4422b3f4 f8bfb124
Showing 2 changed files with 36 additions and 12 deletions Show diff stats
app/views/problems/_issue_tracker_links.html.haml
spec/views/problems/show.html.haml_spec.rb
@@ -6,10 +6,10 @@
     %span.disabled= link_to 'creating...', '#', :class => "#{problem.issue_type}_inactive create-issue"
     = link_to 'retry', create_issue_app_problem_path(app, problem), :method => :post
   - else
-    - if app.github_repo?
+    - if app.issue_tracker_configured? && !app.issue_tracker.label.eql?('github')
+      %span= link_to 'create issue', create_issue_app_problem_path(app, problem), :method => :post, :class => "#{app.issue_tracker.label}_create create-issue"
+    - elsif app.github_repo?
       - if current_user.can_create_github_issues?
         %span= link_to 'create issue', create_issue_app_problem_path(app, problem, :tracker => 'user_github'), :method => :post, :class => "github_create create-issue"
       - elsif app.issue_tracker_configured? && app.issue_tracker.label.eql?('github')
         %span= link_to 'create issue', create_issue_app_problem_path(app, problem), :method => :post, :class => "github_create create-issue"
-    - if app.issue_tracker_configured? && !app.issue_tracker.label.eql?('github')
-      %span= link_to 'create issue', create_issue_app_problem_path(app, problem), :method => :post, :class => "#{app.issue_tracker.label}_create create-issue"
@@ -115,25 +115,49 @@ describe &quot;problems/show.html.haml&quot; do
         before do
           with_issue_tracker("PivotalLabsTracker", problem)
         end
-        context "with problem without issue link" do
+
+        context "with app having github_repo" do
+          let(:app) { App.new(:new_record => false, :github_repo => 'foo/bar') }
+          let(:problem){ Problem.new(:new_record => false, :app => app) }
+
           before do
             problem.issue_link = nil
+            user = Fabricate(:user, :github_login => 'test_user', :github_oauth_token => 'abcdef')
+            controller.stub(:current_user) { user }
           end
-          it 'not see link if no issue tracker' do
+
+          it 'links to the associated tracker' do
             render
-            expect(view.content_for(:action_bar)).to match(/create issue/)
+            expect(view.content_for(:action_bar)).to match(".pivotal_create.create-issue")
           end
+          it 'does not link to github' do
+            render
+            expect(view.content_for(:action_bar)).to_not match(".github_create.create-issue")
+          end
         end
-        context "with problem with issue link" do
-          before do
-            problem.issue_link = 'http://foo'
+        context "without app having github_repo" do
+          context "with problem without issue link" do
+            before do
+              problem.issue_link = nil
+            end
+            it 'not see link if no issue tracker' do
+              render
+              expect(view.content_for(:action_bar)).to match(/create issue/)
+            end
+
           end
-          it 'not see link if no issue tracker' do
-            render
-            expect(view.content_for(:action_bar)).to_not match(/create issue/)
+          context "with problem with issue link" do
+            before do
+              problem.issue_link = 'http://foo'
+            end
+
+            it 'not see link if no issue tracker' do
+              render
+              expect(view.content_for(:action_bar)).to_not match(/create issue/)
+            end
           end
         end
	@@ -115,25 +115,49 @@ describe "problems/show.html.haml" do		@@ -115,25 +115,49 @@ describe "problems/show.html.haml" do
115	before do	115	before do
116	with_issue_tracker("PivotalLabsTracker", problem)	116	with_issue_tracker("PivotalLabsTracker", problem)
117	end	117	end
118	- context "with problem without issue link" do	118	+
		119	+ context "with app having github_repo" do
		120	+ let(:app) { App.new(:new_record => false, :github_repo => 'foo/bar') }
		121	+ let(:problem){ Problem.new(:new_record => false, :app => app) }
		122	+
119	before do	123	before do
120	problem.issue_link = nil	124	problem.issue_link = nil
		125	+ user = Fabricate(:user, :github_login => 'test_user', :github_oauth_token => 'abcdef')
		126	+ controller.stub(:current_user) { user }
121	end	127	end
122	- it 'not see link if no issue tracker' do	128	+
		129	+ it 'links to the associated tracker' do
123	render	130	render
124	- expect(view.content_for(:action_bar)).to match(/create issue/)	131	+ expect(view.content_for(:action_bar)).to match(".pivotal_create.create-issue")
125	end	132	end
126		133
		134	+ it 'does not link to github' do
		135	+ render
		136	+ expect(view.content_for(:action_bar)).to_not match(".github_create.create-issue")
		137	+ end
127	end	138	end
128		139
129	- context "with problem with issue link" do
130	- before do
131	- problem.issue_link = 'http://foo'	140	+ context "without app having github_repo" do
		141	+ context "with problem without issue link" do
		142	+ before do
		143	+ problem.issue_link = nil
		144	+ end
		145	+ it 'not see link if no issue tracker' do
		146	+ render
		147	+ expect(view.content_for(:action_bar)).to match(/create issue/)
		148	+ end
		149	+
132	end	150	end
133		151
134	- it 'not see link if no issue tracker' do
135	- render
136	- expect(view.content_for(:action_bar)).to_not match(/create issue/)	152	+ context "with problem with issue link" do
		153	+ before do
		154	+ problem.issue_link = 'http://foo'
		155	+ end
		156	+
		157	+ it 'not see link if no issue tracker' do
		158	+ render
		159	+ expect(view.content_for(:action_bar)).to_not match(/create issue/)
		160	+ end
137	end	161	end
138	end	162	end
139		163