Fix tests

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

spec/controllers/blob_controller_spec.rb

@@ -44,8 +44,8 @@ describe Projects::BlobController do
     end
 
     context 'redirect to tree' do
-      let(:id) { 'master/doc' }
-      it { should redirect_to("/#{project.path_with_namespace}/tree/master/doc") }
+      let(:id) { 'markdown/doc' }
+      it { should redirect_to("/#{project.path_with_namespace}/tree/markdown/doc") }
     end
   end
 end

spec/controllers/tree_controller_spec.rb

@@ -26,7 +26,7 @@ describe Projects::TreeController do
     end
 
     context "valid branch, valid path" do
-      let(:id) { 'master/app/' }
+      let(:id) { 'master/encoding/' }
       it { should respond_with(:success) }
     end
 
@@ -36,7 +36,7 @@ describe Projects::TreeController do
     end
 
     context "invalid branch, valid path" do
-      let(:id) { 'invalid-branch/app/' }
+      let(:id) { 'invalid-branch/encoding/' }
       it { should respond_with(:not_found) }
     end
   end

spec/features/notes_on_merge_requests_spec.rb

 require 'spec_helper'
 
-describe "On a merge request", js: true, feature: true do
-  let!(:merge_request) { create(:merge_request, :simple) }
+describe 'Comments' do
+  include RepoHelpers
+
+  describe "On a merge request", js: true, feature: true do
+    let!(:merge_request) { create(:merge_request) }
     let!(:project) { merge_request.source_project }
     let!(:note) { create(:note_on_merge_request, :with_attachment, project: project) }
 
@@ -115,10 +118,10 @@ describe "On a merge request", js: true, feature: true do
         end
       end
     end
-end
+  end
 
-describe "On a merge request diff", js: true, feature: true do
-  let(:merge_request) { create(:merge_request, :with_diffs, :simple) }
+  describe "On a merge request diff", js: true, feature: true do
+    let(:merge_request) { create(:merge_request) }
     let(:project) { merge_request.source_project }
 
     before do
@@ -130,7 +133,7 @@ describe "On a merge request diff", js: true, feature: true do
 
     describe "when adding a note" do
       before do
-      find('a[data-line-code="8ec9a00bfd09b3190ac6b22251dbb1aa95a0579d_7_7"]').click
+        find("a[data-line-code=\"#{line_code}\"]").click
       end
 
       describe "the notes holder" do
@@ -141,13 +144,13 @@ describe "On a merge request diff", js: true, feature: true do
 
       describe "the note form" do
         it "shouldn't add a second form for same row" do
-        find('a[data-line-code="8ec9a00bfd09b3190ac6b22251dbb1aa95a0579d_7_7"]').click
+          find("a[data-line-code=\"#{line_code}\"]").click
 
-        should have_css("tr[id='8ec9a00bfd09b3190ac6b22251dbb1aa95a0579d_7_7'] + .js-temp-notes-holder form", count: 1)
+          should have_css("tr[id='#{line_code}'] + .js-temp-notes-holder form", count: 1)
         end
 
         it "should be removed when canceled" do
-        within(".diff-file form[rel$='8ec9a00bfd09b3190ac6b22251dbb1aa95a0579d_7_7']") do
+          within(".diff-file form[rel$='#{line_code}']") do
             find(".js-close-discussion-note-form").trigger("click")
           end
 
@@ -158,8 +161,8 @@ describe "On a merge request diff", js: true, feature: true do
 
     describe "with muliple note forms" do
       before do
-      find('a[data-line-code="8ec9a00bfd09b3190ac6b22251dbb1aa95a0579d_7_7"]').click
-      find('a[data-line-code="8ec9a00bfd09b3190ac6b22251dbb1aa95a0579d_10_10"]').click
+        find("a[data-line-code=\"#{line_code}\"]").click
+        find("a[data-line-code=\"#{line_code_2}\"]").click
       end
 
       it { should have_css(".js-temp-notes-holder", count: 2) }
@@ -167,11 +170,11 @@ describe "On a merge request diff", js: true, feature: true do
       describe "previewing them separately" do
         before do
           # add two separate texts and trigger previews on both
-        within("tr[id='8ec9a00bfd09b3190ac6b22251dbb1aa95a0579d_7_7'] + .js-temp-notes-holder") do
+          within("tr[id='#{line_code}'] + .js-temp-notes-holder") do
             fill_in "note[note]", with: "One comment on line 7"
             find(".js-note-preview-button").trigger("click")
           end
-        within("tr[id='8ec9a00bfd09b3190ac6b22251dbb1aa95a0579d_10_10'] + .js-temp-notes-holder") do
+          within("tr[id='#{line_code_2}'] + .js-temp-notes-holder") do
             fill_in "note[note]", with: "Another comment on line 10"
             find(".js-note-preview-button").trigger("click")
           end
@@ -180,7 +183,7 @@ describe "On a merge request diff", js: true, feature: true do
 
       describe "posting a note" do
         before do
-        within("tr[id='8ec9a00bfd09b3190ac6b22251dbb1aa95a0579d_10_10'] + .js-temp-notes-holder") do
+          within("tr[id='#{line_code_2}'] + .js-temp-notes-holder") do
             fill_in "note[note]", with: "Another comment on line 10"
             click_button("Add Comment")
           end
@@ -194,4 +197,13 @@ describe "On a merge request diff", js: true, feature: true do
         end
       end
     end
+  end
+
+  def line_code
+    sample_compare.changes.first[:line_code]
+  end
+
+  def line_code_2
+    sample_compare.changes.last[:line_code]
+  end
 end

spec/models/project_wiki_spec.rb

@@ -41,23 +41,13 @@ describe ProjectWiki do
       subject.wiki.should be_a Gollum::Wiki
     end
 
-    before do
-      Gitlab::Shell.any_instance.stub(:add_repository) do
-        create_temp_repo("#{Rails.root}/tmp/test-git-base-path/non-existant.wiki.git")
-      end
-      project.stub(:path_with_namespace).and_return("non-existant")
-    end
-
     it "creates a new wiki repo if one does not yet exist" do
-      wiki = ProjectWiki.new(project, user)
-      wiki.create_page("index", "test content").should_not == false
-
-      FileUtils.rm_rf wiki.send(:path_to_repo)
+      project_wiki.create_page("index", "test content").should be_true
     end
 
     it "raises CouldNotCreateWikiError if it can't create the wiki repository" do
-      ProjectWiki.any_instance.stub(:init_repo).and_return(false)
-      expect { ProjectWiki.new(project, user).wiki }.to raise_exception(ProjectWiki::CouldNotCreateWikiError)
+      project_wiki.stub(:init_repo).and_return(false)
+      expect { project_wiki.send(:create_repo!) }.to raise_exception(ProjectWiki::CouldNotCreateWikiError)
     end
   end