Merge branch 'gist' of https://github.com/Andrew8xx8/gitlabhq into Andrew8xx8-gist

Conflicts:
	Gemfile.lock
	app/models/ability.rb
	app/models/project.rb
	app/views/snippets/_form.html.haml
	db/schema.rb
	features/steps/shared/paths.rb
	spec/factories.rb
	spec/models/project_spec.rb

1 files changed, 0 insertions, 99 deletions

diff --git a/spec/features/snippets_spec.rb b/spec/features/snippets_spec.rb
deleted file mode 100644
index 1a0f6eaeef4..00000000000
--- a/spec/features/snippets_spec.rb
+++ /dev/null
@@ -1,99 +0,0 @@
-require 'spec_helper'
-
-describe "Snippets" do
-  let(:project) { create(:project) }
-
-  before do
-    login_as :user
-    project.team << [@user, :developer]
-  end
-
-  describe "GET /snippets" do
-    before do
-      @snippet = create(:snippet,
-                        author: @user,
-                        project: project)
-
-      visit project_snippets_path(project)
-    end
-
-    subject { page }
-
-    it { should have_content(@snippet.title[0..10]) }
-    it { should have_content(@snippet.project.name) }
-
-    describe "Destroy" do
-      before do
-        # admin access to remove snippet
-        @user.users_projects.destroy_all
-        project.team << [@user, :master]
-        visit edit_project_snippet_path(project, @snippet)
-      end
-
-      it "should remove entry" do
-        expect {
-          click_link "destroy_snippet_#{@snippet.id}"
-        }.to change { Snippet.count }.by(-1)
-      end
-    end
-  end
-
-  describe "New snippet" do
-    before do
-      visit project_snippets_path(project)
-      click_link "New Snippet"
-    end
-
-    it "should open new snippet popup" do
-      page.current_path.should == new_project_snippet_path(project)
-    end
-
-    describe "fill in", js: true do
-      before do
-        fill_in "snippet_title", with: "login function"
-        fill_in "snippet_file_name", with: "test.rb"
-        page.execute_script("editor.insert('def login; end');")
-      end
-
-      it { expect { click_button "Save" }.to change {Snippet.count}.by(1) }
-
-      it "should add new snippet to table" do
-        click_button "Save"
-        page.current_path.should == project_snippet_path(project, Snippet.last)
-        page.should have_content "login function"
-        page.should have_content "test.rb"
-      end
-    end
-  end
-
-  describe "Edit snippet" do
-    before do
-      @snippet = create(:snippet,
-                        author: @user,
-                        project: project)
-      visit project_snippet_path(project, @snippet)
-      click_link "Edit Snippet"
-    end
-
-    it "should open edit page" do
-      page.current_path.should == edit_project_snippet_path(project, @snippet)
-    end
-
-    describe "fill in" do
-      before do
-        fill_in "snippet_title", with: "login function"
-        fill_in "snippet_file_name", with: "test.rb"
-      end
-
-      it { expect { click_button "Save" }.to_not change {Snippet.count} }
-
-      it "should update snippet fields" do
-        click_button "Save"
-
-        page.current_path.should == project_snippet_path(project, @snippet)
-        page.should have_content "login function"
-        page.should have_content "test.rb"
-      end
-    end
-  end
-end