A bit of spinach tests

Dmitriy Zaporozhets
1 parent ab344f31
Showing 11 changed files with 116 additions and 95 deletions Show diff stats
features/admin/logs.feature
features/admin/projects.feature
features/admin/users.feature
features/project/project.feature
features/steps/admin/admin_projects.rb
features/steps/dashboard/dashboard.rb
features/steps/project/project.rb
features/steps/shared/admin.rb
features/steps/shared/paths.rb
features/steps/shared/project.rb
spec/requests/projects_spec.rb
@@ -0,0 +1,13 @@
+Feature: Admin Projects
+  Background:
+    Given I sign in as an admin
+    And there are projects in system
+
+  Scenario: Projects list
+    When I visit admin projects page
+    Then I should see all projects
+
+  Scenario: Projects show
+    When I visit admin projects page
+    And I click on first project
+    Then I should see project details
 Feature: Projects
   Background:
-    Given I signin as a user
+    Given I sign in as a user
     And I own project "Shop"
+    And project "Shop" has push event
     And I visit project "Shop" page
-  # @wip
-  # Scenario: I should see project activity
+  Scenario: I should see project activity
+    When I visit project "Shop" page
+    Then I should see project "Shop" activity feed
-  # @wip
-  # Scenario: I edit project
+  Scenario: I visit edit project
+    When I visit edit project "Shop" page
+    Then I should see project settings
+
+  Scenario: I edit project
+    When I visit edit project "Shop" page
+    And change project settings
+    And I save project
+    Then I should see project with new settings
   # @wip
   # Scenario: I visit attachments
@@ -0,0 +1,24 @@
+class AdminProjects < Spinach::FeatureSteps
+  include SharedAuthentication
+  include SharedPaths
+  include SharedAdmin
+
+  And 'I should see all projects' do
+    Project.all.each do |p|
+      page.should have_content p.name_with_namespace
+    end
+  end
+
+  And 'I click on first project' do
+    click_link Project.first.name_with_namespace
+  end
+
+  Then 'I should see project details' do
+    project = Project.first
+    current_path.should == admin_project_path(project)
+
+    page.should have_content(project.name_with_namespace)
+    page.should have_content(project.creator.name)
+    page.should have_content('Add new team member')
+  end
+end
 class Dashboard < Spinach::FeatureSteps
   include SharedAuthentication
   include SharedPaths
+  include SharedProject
   Then 'I should see "New Project" link' do
     page.should have_link "New Project"
@@ -10,11 +11,6 @@ class Dashboard &lt; Spinach::FeatureSteps
     page.should have_link "Shop"
   end
-  Then 'I should see project "Shop" activity feed' do
-    project = Project.find_by_name("Shop")
-    page.should have_content "#{@user.name} pushed new branch new_design at #{project.name}"
-  end
-
   Then 'I should see last push widget' do
     page.should have_content "You pushed to new_design"
     page.should have_link "Create Merge Request"
@@ -59,11 +55,6 @@ class Dashboard &lt; Spinach::FeatureSteps
     page.should have_content "John Doe left project at Shop"
   end
-  And 'I own project "Shop"' do
-    @project = create :project, name: 'Shop'
-    @project.team << [@user, :master]
-  end
-
   And 'I have group with projects' do
     @group   = create(:group)
     @project = create(:project, group: @group)
@@ -72,32 +63,6 @@ class Dashboard &lt; Spinach::FeatureSteps
     @project.team << [current_user, :master]
   end
-  And 'project "Shop" has push event' do
-    @project = Project.find_by_name("Shop")
-
-    data = {
-      before: "0000000000000000000000000000000000000000",
-      after: "0220c11b9a3e6c69dc8fd35321254ca9a7b98f7e",
-      ref: "refs/heads/new_design",
-      user_id: @user.id,
-      user_name: @user.name,
-      repository: {
-        name: @project.name,
-        url: "localhost/rubinius",
-        description: "",
-        homepage: "localhost/rubinius",
-        private: true
-      }
-    }
-
-    @event = Event.create(
-      project: @project,
-      action: Event::Pushed,
-      data: data,
-      author_id: @user.id
-    )
-  end
-
   Then 'I should see groups list' do
     Group.all.each do |group|
       page.should have_link group.name
@@ -112,5 +77,4 @@ class Dashboard &lt; Spinach::FeatureSteps
   Then 'I should see 1 project at group list' do
     page.find('span.last_activity/span').should have_content('1')
   end
-
 end
@@ -2,4 +2,17 @@ class Projects &lt; Spinach::FeatureSteps
   include SharedAuthentication
   include SharedProject
   include SharedPaths
+
+  And 'change project settings' do
+    fill_in 'project_name', with: 'NewName'
+    uncheck 'project_issues_enabled'
+  end
+
+  And 'I save project' do
+    click_button 'Save'
+  end
+
+  Then 'I should see project with new settings' do
+    find_field('project_name').value.should == 'NewName'
+  end
 end
@@ -0,0 +1,8 @@
+module SharedAdmin
+  include Spinach::DSL
+
+  And 'there are projects in system' do
+    2.times { create(:project) }
+  end
+end
+
@@ -165,6 +165,11 @@ module SharedPaths
     visit project_path(project)
   end
+  When 'I visit edit project "Shop" page' do
+    project = Project.find_by_name("Shop")
+    visit edit_project_path(project)
+  end
+
   Given 'I visit project branches page' do
     visit branches_project_repository_path(@project)
   end
@@ -13,6 +13,44 @@ module SharedProject
     @project.team << [@user, :master]
   end
+  And 'project "Shop" has push event' do
+    @project = Project.find_by_name("Shop")
+
+    data = {
+      before: "0000000000000000000000000000000000000000",
+      after: "0220c11b9a3e6c69dc8fd35321254ca9a7b98f7e",
+      ref: "refs/heads/new_design",
+      user_id: @user.id,
+      user_name: @user.name,
+      repository: {
+        name: @project.name,
+        url: "localhost/rubinius",
+        description: "",
+        homepage: "localhost/rubinius",
+        private: true
+      }
+    }
+
+    @event = Event.create(
+      project: @project,
+      action: Event::Pushed,
+      data: data,
+      author_id: @user.id
+    )
+  end
+
+  Then 'I should see project "Shop" activity feed' do
+    project = Project.find_by_name("Shop")
+    page.should have_content "#{@user.name} pushed new branch new_design at #{project.name}"
+  end
+
+  Then 'I should see project settings' do
+    current_path.should == edit_project_path(@project)
+    page.should have_content("Project name is")
+    page.should have_content("Advanced settings:")
+    page.should have_content("Features:")
+  end
+
   def current_project
     @project ||= Project.first
   end
@@ -3,59 +3,6 @@ require &#39;spec_helper&#39;
 describe "Projects" do
   before { login_as :user }
-  describe "GET /projects/show" do
-    before do
-      @project = create(:project, namespace: @user.namespace)
-      @project.team << [@user, :reporter]
-
-      visit project_path(@project)
-    end
-
-    it "should be correct path" do
-      current_path.should == project_path(@project)
-    end
-  end
-
-  describe "GET /projects/:id/edit" do
-    before do
-      @project = create(:project)
-      @project.team << [@user, :master]
-
-      visit edit_project_path(@project)
-    end
-
-    it "should be correct path" do
-      current_path.should == edit_project_path(@project)
-    end
-
-    it "should have labels for new project" do
-      page.should have_content("Project name is")
-      page.should have_content("Advanced settings:")
-      page.should have_content("Features:")
-    end
-  end
-
-  describe "PUT /projects/:id" do
-    before do
-      @project = create(:project, namespace: @user.namespace)
-      @project.team << [@user, :master]
-
-      visit edit_project_path(@project)
-
-      fill_in 'project_name', with: 'Awesome'
-      click_button "Save"
-      @project = @project.reload
-    end
-
-    it "should be correct path" do
-      current_path.should == edit_project_path(@project)
-    end
-
-    it "should show project" do
-      page.should have_content("Awesome")
-    end
-  end
-
   describe "DELETE /projects/:id" do
     before do
       @project = create(:project, namespace: @user.namespace)
@@ -0,0 +1,13 @@		@@ -0,0 +1,13 @@
	1	+Feature: Admin Projects
	2	+ Background:
	3	+ Given I sign in as an admin
	4	+ And there are projects in system
	5	+
	6	+ Scenario: Projects list
	7	+ When I visit admin projects page
	8	+ Then I should see all projects
	9	+
	10	+ Scenario: Projects show
	11	+ When I visit admin projects page
	12	+ And I click on first project
	13	+ Then I should see project details
@@ -0,0 +1,24 @@		@@ -0,0 +1,24 @@
	1	+class AdminProjects < Spinach::FeatureSteps
	2	+ include SharedAuthentication
	3	+ include SharedPaths
	4	+ include SharedAdmin
	5	+
	6	+ And 'I should see all projects' do
	7	+ Project.all.each do \|p\|
	8	+ page.should have_content p.name_with_namespace
	9	+ end
	10	+ end
	11	+
	12	+ And 'I click on first project' do
	13	+ click_link Project.first.name_with_namespace
	14	+ end
	15	+
	16	+ Then 'I should see project details' do
	17	+ project = Project.first
	18	+ current_path.should == admin_project_path(project)
	19	+
	20	+ page.should have_content(project.name_with_namespace)
	21	+ page.should have_content(project.creator.name)
	22	+ page.should have_content('Add new team member')
	23	+ end
	24	+end
1	class Dashboard < Spinach::FeatureSteps	1	class Dashboard < Spinach::FeatureSteps
2	include SharedAuthentication	2	include SharedAuthentication
3	include SharedPaths	3	include SharedPaths
		4	+ include SharedProject
4		5
5	Then 'I should see "New Project" link' do	6	Then 'I should see "New Project" link' do
6	page.should have_link "New Project"	7	page.should have_link "New Project"
	@@ -10,11 +11,6 @@ class Dashboard < Spinach::FeatureSteps		@@ -10,11 +11,6 @@ class Dashboard < Spinach::FeatureSteps
10	page.should have_link "Shop"	11	page.should have_link "Shop"
11	end	12	end
12		13
13	- Then 'I should see project "Shop" activity feed' do
14	- project = Project.find_by_name("Shop")
15	- page.should have_content "#{@user.name} pushed new branch new_design at #{project.name}"
16	- end
17	-
18	Then 'I should see last push widget' do	14	Then 'I should see last push widget' do
19	page.should have_content "You pushed to new_design"	15	page.should have_content "You pushed to new_design"
20	page.should have_link "Create Merge Request"	16	page.should have_link "Create Merge Request"
	@@ -59,11 +55,6 @@ class Dashboard < Spinach::FeatureSteps		@@ -59,11 +55,6 @@ class Dashboard < Spinach::FeatureSteps
59	page.should have_content "John Doe left project at Shop"	55	page.should have_content "John Doe left project at Shop"
60	end	56	end
61		57
62	- And 'I own project "Shop"' do
63	- @project = create :project, name: 'Shop'
64	- @project.team << [@user, :master]
65	- end
66	-
67	And 'I have group with projects' do	58	And 'I have group with projects' do
68	@group = create(:group)	59	@group = create(:group)
69	@project = create(:project, group: @group)	60	@project = create(:project, group: @group)
	@@ -72,32 +63,6 @@ class Dashboard < Spinach::FeatureSteps		@@ -72,32 +63,6 @@ class Dashboard < Spinach::FeatureSteps
72	@project.team << [current_user, :master]	63	@project.team << [current_user, :master]
73	end	64	end
74		65
75	- And 'project "Shop" has push event' do
76	- @project = Project.find_by_name("Shop")
77	-
78	- data = {
79	- before: "0000000000000000000000000000000000000000",
80	- after: "0220c11b9a3e6c69dc8fd35321254ca9a7b98f7e",
81	- ref: "refs/heads/new_design",
82	- user_id: @user.id,
83	- user_name: @user.name,
84	- repository: {
85	- name: @project.name,
86	- url: "localhost/rubinius",
87	- description: "",
88	- homepage: "localhost/rubinius",
89	- private: true
90	- }
91	- }
92	-
93	- @event = Event.create(
94	- project: @project,
95	- action: Event::Pushed,
96	- data: data,
97	- author_id: @user.id
98	- )
99	- end
100	-
101	Then 'I should see groups list' do	66	Then 'I should see groups list' do
102	Group.all.each do \|group\|	67	Group.all.each do \|group\|
103	page.should have_link group.name	68	page.should have_link group.name
	@@ -112,5 +77,4 @@ class Dashboard < Spinach::FeatureSteps		@@ -112,5 +77,4 @@ class Dashboard < Spinach::FeatureSteps
112	Then 'I should see 1 project at group list' do	77	Then 'I should see 1 project at group list' do
113	page.find('span.last_activity/span').should have_content('1')	78	page.find('span.last_activity/span').should have_content('1')
114	end	79	end
115	-
116	end	80	end
	@@ -2,4 +2,17 @@ class Projects < Spinach::FeatureSteps		@@ -2,4 +2,17 @@ class Projects < Spinach::FeatureSteps
2	include SharedAuthentication	2	include SharedAuthentication
3	include SharedProject	3	include SharedProject
4	include SharedPaths	4	include SharedPaths
		5	+
		6	+ And 'change project settings' do
		7	+ fill_in 'project_name', with: 'NewName'
		8	+ uncheck 'project_issues_enabled'
		9	+ end
		10	+
		11	+ And 'I save project' do
		12	+ click_button 'Save'
		13	+ end
		14	+
		15	+ Then 'I should see project with new settings' do
		16	+ find_field('project_name').value.should == 'NewName'
		17	+ end
5	end	18	end
@@ -0,0 +1,8 @@		@@ -0,0 +1,8 @@
	1	+module SharedAdmin
	2	+ include Spinach::DSL
	3	+
	4	+ And 'there are projects in system' do
	5	+ 2.times { create(:project) }
	6	+ end
	7	+end
	8	+
	@@ -13,6 +13,44 @@ module SharedProject		@@ -13,6 +13,44 @@ module SharedProject
13	@project.team << [@user, :master]	13	@project.team << [@user, :master]
14	end	14	end
15		15
		16	+ And 'project "Shop" has push event' do
		17	+ @project = Project.find_by_name("Shop")
		18	+
		19	+ data = {
		20	+ before: "0000000000000000000000000000000000000000",
		21	+ after: "0220c11b9a3e6c69dc8fd35321254ca9a7b98f7e",
		22	+ ref: "refs/heads/new_design",
		23	+ user_id: @user.id,
		24	+ user_name: @user.name,
		25	+ repository: {
		26	+ name: @project.name,
		27	+ url: "localhost/rubinius",
		28	+ description: "",
		29	+ homepage: "localhost/rubinius",
		30	+ private: true
		31	+ }
		32	+ }
		33	+
		34	+ @event = Event.create(
		35	+ project: @project,
		36	+ action: Event::Pushed,
		37	+ data: data,
		38	+ author_id: @user.id
		39	+ )
		40	+ end
		41	+
		42	+ Then 'I should see project "Shop" activity feed' do
		43	+ project = Project.find_by_name("Shop")
		44	+ page.should have_content "#{@user.name} pushed new branch new_design at #{project.name}"
		45	+ end
		46	+
		47	+ Then 'I should see project settings' do
		48	+ current_path.should == edit_project_path(@project)
		49	+ page.should have_content("Project name is")
		50	+ page.should have_content("Advanced settings:")
		51	+ page.should have_content("Features:")
		52	+ end
		53	+
16	def current_project	54	def current_project
17	@project \|\|= Project.first	55	@project \|\|= Project.first
18	end	56	end
	@@ -3,59 +3,6 @@ require 'spec_helper'		@@ -3,59 +3,6 @@ require 'spec_helper'
3	describe "Projects" do	3	describe "Projects" do
4	before { login_as :user }	4	before { login_as :user }
5		5
6	- describe "GET /projects/show" do
7	- before do
8	- @project = create(:project, namespace: @user.namespace)
9	- @project.team << [@user, :reporter]
10	-
11	- visit project_path(@project)
12	- end
13	-
14	- it "should be correct path" do
15	- current_path.should == project_path(@project)
16	- end
17	- end
18	-
19	- describe "GET /projects/:id/edit" do
20	- before do
21	- @project = create(:project)
22	- @project.team << [@user, :master]
23	-
24	- visit edit_project_path(@project)
25	- end
26	-
27	- it "should be correct path" do
28	- current_path.should == edit_project_path(@project)
29	- end
30	-
31	- it "should have labels for new project" do
32	- page.should have_content("Project name is")
33	- page.should have_content("Advanced settings:")
34	- page.should have_content("Features:")
35	- end
36	- end
37	-
38	- describe "PUT /projects/:id" do
39	- before do
40	- @project = create(:project, namespace: @user.namespace)
41	- @project.team << [@user, :master]
42	-
43	- visit edit_project_path(@project)
44	-
45	- fill_in 'project_name', with: 'Awesome'
46	- click_button "Save"
47	- @project = @project.reload
48	- end
49	-
50	- it "should be correct path" do
51	- current_path.should == edit_project_path(@project)
52	- end
53	-
54	- it "should show project" do
55	- page.should have_content("Awesome")
56	- end
57	- end
58	-
59	describe "DELETE /projects/:id" do	6	describe "DELETE /projects/:id" do
60	before do	7	before do
61	@project = create(:project, namespace: @user.namespace)	8	@project = create(:project, namespace: @user.namespace)