Non-interactive AWS install by running a single script.

Merge branch 'master' into non-interactive-aws-install

Conflicts:
	doc/installation.md

Fix merge mess in installation.md

features/profile/ssh_keys.feature

@@ -3,8 +3,8 @@ Feature: SSH Keys
     Given I signin as a user
     And I have ssh keys:
       | title | 
-      | Work |
-      | Home | 
+      | ssh-rsa Work |
+      | ssh-rsa Home |
     And I visit profile keys page
 
   Scenario: I should see SSH keys

features/projects/issues/labels.feature

@@ -0,0 +1,13 @@
+Feature: Labels
+  Background:
+    Given I signin as a user
+    And I own project "Shop"
+    And project "Shop" have issues tags: 
+     | name    |
+     | bug     |
+     | feature |
+    Given I visit project "Shop" labels page 
+
+  Scenario: I should see active milestones
+    Then I should see label "bug"
+    And I should see label "feature"

features/projects/network.feature

@@ -4,9 +4,7 @@ Feature: Project Network Graph
   Background:
     Given I signin as a user
     And I own project "Shop"
-    And I visit project "Shop" network page 
+    And I visit project "Shop" network page
 
   Scenario: I should see project network
     Then page should have network graph
-    
-

features/step_definitions/dashboard_steps.rb

@@ -91,36 +91,24 @@ Then /^I should see my merge requests$/ do
 end
 
 Given /^I have assigned issues$/ do
-  project1 = Factory :project,
-   :path => "project1",
-   :code => "gitlabhq_1"
-
-  project2 = Factory :project,
-   :path => "project2",
-   :code => "gitlabhq_2"
-
-  project1.add_access(@user, :read, :write)
-  project2.add_access(@user, :read, :write)
+  project = Factory :project
+  project.add_access(@user, :read, :write)
 
   issue1 = Factory :issue,
    :author => @user,
    :assignee => @user,
-   :project => project1
+   :project => project
 
   issue2 = Factory :issue,
    :author => @user,
    :assignee => @user,
-   :project => project2
+   :project => project
 end
 
 Given /^I have authored merge requests$/ do
-  project1 = Factory :project,
-   :path => "project1",
-   :code => "gitlabhq_1"
+  project1 = Factory :project
 
-  project2 = Factory :project,
-   :path => "project2",
-   :code => "gitlabhq_2"
+  project2 = Factory :project
 
   project1.add_access(@user, :read, :write)
   project2.add_access(@user, :read, :write)

features/step_definitions/profile/profile_keys_steps.rb

@@ -16,7 +16,7 @@ end
 
 Given /^I submit new ssh key "(.*?)"$/ do |arg1|
   fill_in "key_title", :with => arg1
-  fill_in "key_key", :with => "publickey234="
+  fill_in "key_key", :with => "ssh-rsa publickey234="
   click_button "Save"
 end
 

features/step_definitions/project/project_issues_steps.rb

@@ -33,6 +33,25 @@ Given /^I visit issue page "(.*?)"$/ do |arg1|
 end
 
 Given /^I submit new issue "(.*?)"$/ do |arg1|
-  fill_in "issue_title", :with => arg1
+  fill_in "issue_title", with: arg1
   click_button "Submit new issue"
 end
+
+Given /^project "(.*?)" have issues tags:$/ do |arg1, table|
+  project = Project.find_by_name(arg1)
+  table.hashes.each do |hash|
+    Factory :issue,
+      project: project,
+      label_list: [hash[:name]]
+  end
+end
+
+Given /^I visit project "(.*?)" labels page$/ do |arg1|
+  visit project_labels_path(Project.find_by_name(arg1))
+end
+
+Then /^I should see label "(.*?)"$/ do |arg1|
+  within ".labels-table" do 
+    page.should have_content arg1
+  end
+end

features/step_definitions/project/projects_steps.rb

@@ -1,4 +1,4 @@
-include LoginMacros
+include LoginHelpers
 
 Given /^I signin as a user$/ do
   login_as :user
@@ -57,6 +57,11 @@ end
 
 Given /^I visit project "(.*?)" network page$/ do |arg1|
   project = Project.find_by_name(arg1)
+
+  # Stub out find_all to speed this up (10 commits vs. 650)
+  commits = Grit::Commit.find_all(project.repo, nil, {max_count: 10})
+  Grit::Commit.stub(:find_all).and_return(commits)
+
   visit graph_project_path(project)
 end
 
@@ -67,8 +72,8 @@ end
 Given /^page should have network graph$/ do
   page.should have_content "Project Network Graph"
   within ".graph" do
-    page.should have_content "stable"
-    page.should have_content "notes_refacto..."
+    page.should have_content "master"
+    page.should have_content "scss_refactor..."
   end
 end
 

features/support/env.rb

@@ -1,13 +1,16 @@
-require 'simplecov'
-SimpleCov.start 'rails'
+unless ENV['CI']
+  require 'simplecov'
+  SimpleCov.start 'rails'
+end
 
 require 'cucumber/rails'
 require 'webmock/cucumber'
+
 WebMock.allow_net_connect!
 
-require Rails.root.join 'spec/monkeypatch'
-require Rails.root.join 'spec/factories'
-require Rails.root.join 'spec/support/login'
+require Rails.root.join 'spec/support/gitolite_stub'
+require Rails.root.join 'spec/support/stubbed_repository'
+require Rails.root.join 'spec/support/login_helpers'
 require Rails.root.join 'spec/support/valid_commit'
 
 Capybara.default_selector = :css
@@ -44,3 +47,13 @@ require 'headless'
 
 headless = Headless.new
 headless.start
+
+require 'cucumber/rspec/doubles'
+
+include GitoliteStub
+
+Before do
+  stub_gitolite!
+end
+
+World(FactoryGirl::Syntax::Methods)