Merge pull request #291 from mezuro/bug_busters

Bug busters

Merge pull request #291 from mezuro/bug_busters
Bug busters
Rafael Manzo
2 parents f780d223 a322eb1f
Showing 18 changed files with 182 additions and 55 deletions Show diff stats
app/controllers/projects_controller.rb
app/models/project.rb
app/models/project_attributes.rb
app/views/modules/_module_tree.html.erb
config/deploy.rb
db/migrate/20151106182639_change_project_attributes_public_default.rb
db/schema.rb
features/project/deletion.feature
features/project/edition.feature
features/project/listing.feature
features/project/show.feature
features/repository/create.feature
features/repository/show/modules_tree.feature
features/step_definitions/project_steps.rb
spec/controllers/projects_controller_spec.rb
spec/factories/project_attributes.rb
spec/models/project_attributes_spec.rb
spec/models/project_spec.rb
@@ -13,7 +13,7 @@ class ProjectsController &lt; ApplicationController
   # GET /projects
   # GET /projects.json
   def index
-    @projects = Project.all.select { |project| !project.attributes.hidden }
+    @projects = Project.public_or_owned_by_user(current_user)
   end
  
   # POST /projects
@@ -3,18 +3,30 @@ class Project &lt; KalibroClient::Entities::Processor::Project
  
   attr_writer :attributes
  
+  def self.public_or_owned_by_user(user = nil)
+    project_attributes = ProjectAttributes.where(public: true)
+    project_attributes += ProjectAttributes.where(user_id: user.id, public: false) if user
+
+    project_attributes.map do |attribute|
+      begin
+        self.find(attribute.project_id)
+      rescue KalibroClient::Errors::RecordNotFound
+        nil
+      end
+    end.compact
+  end
+
   def self.latest(count = 1)
-    all.sort { |a,b| b.id <=> a.id }.select { |project| !project.attributes.hidden}.first(count)
+    all.sort { |a, b| b.id <=> a.id }.select { |project| project.attributes.public }.first(count)
   end
  
   def attributes
-    @project_attributes ||= ProjectAttributes.find_by_project_id(self.id)
-    @project_attributes.nil? ? ProjectAttributes.new : @project_attributes
+    @attributes ||= ProjectAttributes.find_by_project_id(@id)
   end
  
   def destroy
-    self.attributes.destroy if self.attributes
-    @project_attributes = nil
+    self.attributes.destroy unless self.attributes.nil?
+    @attributes = nil
     super
   end
 end
@@ -4,6 +4,11 @@ class ProjectAttributes &lt; ActiveRecord::Base
   validates :user, presence: true
  
   def project
-    Project.find(self.project_id)
+    @project ||= Project.find(project_id)
+  end
+
+  def project=(project)
+    @project = project
+    self.project_id = project.id
   end
 end
@@ -10,7 +10,8 @@
   <strong><%= KalibroModule.human_attribute_name('grade') %>:</strong>
   <%= format_grade(@root_module_result.grade) %>
 </p>
-<% unless @root_module_result.parent_id.nil? %>
+
+<% unless @root_module_result.parent_id == 0 %>
   <p id="parent"><i class="icon-arrow-up"></i><%= link_to '../', '#parent', onClick: "Module.Tree.load('#{escape_javascript(image_tag 'loader.gif')} #{escape_javascript(t('loading_data'))}', #{@root_module_result.parent_id});" %></p>
 <% end %>
  
 set :application, 'mezuro'
 set :repo_url, 'https://github.com/mezuro/mezuro.git'
  
-# ask :branch, proc { `git rev-parse --abbrev-ref HEAD`.chomp }
+set :branch, 'stable'
  
 set :deploy_to, "/home/mezuro/app"
 # set :scm, :git
@@ -0,0 +1,15 @@
+class ChangeProjectAttributesPublicDefault < ActiveRecord::Migration
+  def up
+    rename_column :project_attributes, :hidden, :public
+    change_column_default :project_attributes, :public, true
+
+    ProjectAttributes.all.update_all('public = NOT public')
+  end
+
+  def down
+    rename_column :project_attributes, :public, :hidden
+    change_column_default :project_attributes, :hidden, false
+
+    ProjectAttributes.all.update_all('hidden = NOT hidden')
+  end
+end
@@ -11,7 +11,10 @@
 #
 # It's strongly recommended that you check this file into your version control system.
  
-ActiveRecord::Schema.define(version: 20150616164352) do
+ActiveRecord::Schema.define(version: 20151106182639) do
+
+  # These are extensions that must be enabled in order to support this database
+  enable_extension "plpgsql"
  
   create_table "kalibro_configuration_attributes", force: :cascade do |t|
     t.integer  "user_id"
@@ -25,9 +28,9 @@ ActiveRecord::Schema.define(version: 20150616164352) do
     t.integer  "project_id"
     t.string   "image_url"
     t.integer  "user_id"
-    t.boolean  "hidden",     default: false
-    t.datetime "created_at",                 null: false
-    t.datetime "updated_at",                 null: false
+    t.boolean  "public",     default: true
+    t.datetime "created_at",                null: false
+    t.datetime "updated_at",                null: false
   end
  
   create_table "reading_group_attributes", force: :cascade do |t|
@@ -45,7 +48,7 @@ ActiveRecord::Schema.define(version: 20150616164352) do
     t.datetime "updated_at",    null: false
   end
  
-  add_index "repository_attributes", ["user_id"], name: "index_repository_attributes_on_user_id"
+  add_index "repository_attributes", ["user_id"], name: "index_repository_attributes_on_user_id", using: :btree
  
   create_table "users", force: :cascade do |t|
     t.string   "name",                   limit: 255, default: "", null: false
@@ -63,7 +66,7 @@ ActiveRecord::Schema.define(version: 20150616164352) do
     t.string   "last_sign_in_ip",        limit: 255
   end
  
-  add_index "users", ["email"], name: "index_users_on_email", unique: true
-  add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
+  add_index "users", ["email"], name: "index_users_on_email", unique: true, using: :btree
+  add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true, using: :btree
  
 end
@@ -22,7 +22,6 @@ Feature: Project Deletion
     Given I am a regular user
     And I am signed in
     And I own a sample project
-    And I have sample project_attributes
     And I am at the Sample Project page
     When I click the Destroy Project link
     Then I should be in the All Projects page
@@ -8,13 +8,12 @@ Feature: Project
     Given I am a regular user
     And I am signed in
     And I own a sample project
-    And I have sample project_attributes
     And I am at the All Projects page
     When I click the Edit link
     Then I should be in the Edit Project page
  
   @kalibro_processor_restart
-  Scenario: Should not show edit links from projects that doesn't belongs to me
+  Scenario: Should not show edit links from projects that doesn't belong to me
     Given I am a regular user
     And I am signed in
     And I have a sample project
@@ -22,7 +21,7 @@ Feature: Project
     Then I should not see Edit within table
  
   @kalibro_processor_restart
-  Scenario: Should not render the edit page if the project doesn't belongs to the current user
+  Scenario: Should not render the edit page if the project doesn't belong to the current user
     Given I am a regular user
     And I am signed in
     And I have a sample project
@@ -35,7 +34,6 @@ Feature: Project
     Given I am a regular user
     And I am signed in
     And I own a sample project
-    And I have sample project_attributes
     And I am at the All Projects page
     When I click the Edit link
     Then The field "project[name]" should be filled with the sample project "name"
@@ -46,7 +44,6 @@ Feature: Project
     Given I am a regular user
     And I am signed in
     And I own a sample project
-    And I have sample project_attributes
     And I am at the sample project edit page
     And I fill the Name field with "Kalibro"
     And I fill the Description field with "Web Service to collect metrics"
@@ -61,7 +58,6 @@ Feature: Project
     And I have a project named "Qt-Calculator"
     And I own a project named "Kalibro"
     And I am at the sample project edit page
-    And I have sample project_attributes
     And I fill the Name field with "Qt-Calculator"
     When I press the Save button
     Then I should see "Name has already been taken"
@@ -71,7 +67,6 @@ Feature: Project
     Given I am a regular user
     And I am signed in
     And I own a sample project
-    And I have sample project_attributes
     And I am at the sample project edit page
     And I fill the Description field with "Web Service to collect metrics"
     When I press the Save button
@@ -82,7 +77,6 @@ Feature: Project
     Given I am a regular user
     And I am signed in
     And I own a sample project
-    And I have sample project_attributes
     And I am at the sample project edit page
     And I fill the Name field with " "
     When I press the Save button
@@ -25,7 +25,6 @@ Feature: Project listing
     Given I am a regular user
     And I am signed in
     And I have a sample project
-    And I have sample project_attributes
     And I am at the All Projects page
     When I click the Show link
     Then the sample project should be there
@@ -7,7 +7,6 @@ Feature: Show Project
 Scenario: Should not show the create repository link to user that doesn't own the project
   Given I am a regular user
   And I have a sample project
-  And I have sample project_attributes
   And I have a sample configuration with native metrics
   And I have a sample repository within the sample project
   When I am at the Sample Project page
@@ -20,7 +19,6 @@ Scenario: Should show the create repository link the project owner
   Given I am a regular user
   And I am signed in
   And I own a sample project
-  And I have sample project_attributes
   When I am at the Sample Project page
   Then I should see "New Repository"
  
@@ -29,7 +27,6 @@ Scenario: Should not show the independent repositories for a project
   Given I am a regular user
   And I am signed in
   And I own a sample project
-  And I have sample project_attributes
   And I have a sample configuration
   And I have a sample repository
   When I am at the Sample Project page
@@ -39,7 +36,6 @@ Scenario: Should not show the independent repositories for a project
 Scenario: Considering the project has no repositories
   Given I am a regular user
   And I have a sample project
-  And I have sample project_attributes
   When I am at the Sample Project page
   Then I should see "There are no Repositories yet!"
  
@@ -56,6 +52,5 @@ Scenario: Considering the project has repositories
 Scenario: Checking project contents
   Given I am a regular user
   And I have a sample project
-  And I have sample project_attributes
   When I am at the Sample Project page
   Then the sample project should be there
@@ -8,7 +8,6 @@ Scenario: repository creation associated with a project
   Given I am a regular user
   And I am signed in
   And I own a sample project
-  And I have sample project_attributes
   And I have a sample configuration with native metrics
   And I am at the New Repository page
   And I fill the Name field with "Kalibro"
@@ -17,6 +17,7 @@ Feature: Repository modules tree
     When I visit the repository show page
     And I click the "Modules Tree" h3
     Then I should see the given module result
+    And I should not see "../"
  
   @kalibro_configuration_restart @kalibro_processor_restart @javascript
   Scenario: Should show children of root when the process has been finished
@@ -6,14 +6,12 @@ end
  
 Given(/^I have a sample project$/) do
   @project = FactoryGirl.create(:project)
-end
-
-Given(/^I have sample project_attributes$/) do
-  @project_attributes = FactoryGirl.create(:project_attributes, {id: nil, user_id: @user.id})
+  @project.attributes = FactoryGirl.create(:project_attributes, project: @project)
 end
  
 Given(/^I have a project named "(.*?)"$/) do |name|
   @project = FactoryGirl.create(:project, {name: name})
+  @project.attributes = FactoryGirl.create(:project_attributes, project: @project)
 end
  
 Given(/^I own a sample project$/) do
@@ -148,12 +148,10 @@ describe ProjectsController, :type =&gt; :controller do
   end
  
   describe 'index' do
-    let(:project_attributes) { FactoryGirl.build(:project_attributes) }
+    subject { FactoryGirl.build(:project_with_id) }
  
     before :each do
-      @subject = FactoryGirl.build(:project_with_id)
-      Project.expects(:all).returns([@subject])
-      @subject.expects(:attributes).returns(project_attributes)
+      Project.expects(:public_or_owned_by_user).returns([subject])
       get :index
     end
  
 FactoryGirl.define do
   factory :project_attributes, :class => 'ProjectAttributes' do
-    project_id 1
     image_url ''
-    user_id 1
-    hidden false
+    self.public true
+    association :project, :with_id, strategy: :build
+    association :user, strategy: :build
  
     trait :with_image do
       image_url '#'
     end
+
+    trait :private do
+      self.public false
+    end
+
+    trait :bare do
+      project_id nil
+      user_id nil
+    end
   end
 end
@@ -11,10 +11,9 @@ RSpec.describe ProjectAttributes, type: :model do
   end
  
   describe 'methods' do
+    let(:project) { FactoryGirl.build(:project_with_id) }
     describe 'project' do
-      subject { FactoryGirl.build(:project_attributes) }
-      let(:project) {FactoryGirl.build(:project_with_id)}
-
+      subject { FactoryGirl.build(:project_attributes, :bare, project_id: project.id) }
       before :each do
         Project.expects(:find).with(subject.project_id).returns(project)
       end
@@ -23,5 +22,21 @@ RSpec.describe ProjectAttributes, type: :model do
         expect(subject.project).to eq(project)
       end
     end
+
+    describe 'project=' do
+      subject { FactoryGirl.build(:project_attributes, :bare) }
+
+      before do
+        subject.project = project
+      end
+
+      it 'is expected to set the project' do
+        expect(subject.project).to eq project
+      end
+
+      it 'is expected to set the project_id' do
+        expect(subject.project_id).to eq project.id
+      end
+    end
   end
 end
@@ -28,33 +28,47 @@ describe Project, :type =&gt; :model do
     describe 'attributes' do
       subject { FactoryGirl.build(:project_with_id) }
  
-      let!(:project_attributes) { FactoryGirl.build(:project_attributes) }
+      context 'when there are attributes' do
+        let!(:project_attributes) { FactoryGirl.build(:project_attributes) }
  
-      before :each do
-        ProjectAttributes.expects(:find_by_project_id).returns(project_attributes)
+        before :each do
+          ProjectAttributes.expects(:find_by_project_id).returns(project_attributes)
+        end
+
+        it 'is expected to return the project attributes' do
+          expect(subject.attributes).to eq(project_attributes)
+        end
       end
  
-      it 'is expected to return the project attributes' do
-        expect(subject.attributes).to eq(project_attributes)
+      context 'when there are no attributes' do
+        before :each do
+          ProjectAttributes.expects(:find_by_project_id).returns(nil)
+        end
+
+        it 'is expected to return the project attributes' do
+          expect(subject.attributes).to be_nil
+        end
       end
     end
  
     describe 'destroy' do
+      let!(:project) { FactoryGirl.build(:project) }
+
       context 'when attributes exist' do
-        let!(:project) { FactoryGirl.build(:project) }
         let!(:project_attributes) { FactoryGirl.build(:project_attributes, project_id: project.id) }
+        before :each do
+          KalibroClient::Entities::Processor::Project.any_instance.expects(:destroy).returns(project)
+        end
  
-        it 'should be destroyed' do
+        it 'is expected to be destroyed' do
           project.expects(:attributes).twice.returns(project_attributes)
           project_attributes.expects(:destroy)
-          KalibroClient::Entities::Processor::Project.any_instance.expects(:destroy).returns(project)
           project.destroy
         end
  
         it 'is expected to clean the attributes memoization' do
           # Call attributes once so it memoizes
           ProjectAttributes.expects(:find_by).with(project_id: project.id).returns(project_attributes)
-          KalibroClient::Entities::Processor::Project.any_instance.expects(:destroy).returns(project)
           expect(project.attributes).to eq(project_attributes)
  
           # Destroying
@@ -65,6 +79,76 @@ describe Project, :type =&gt; :model do
           expect(project.attributes).to_not eq(project_attributes)
         end
       end
+
+      context 'when attributes is nil' do
+        before do
+          project.expects(:attributes).returns(nil)
+          KalibroClient::Entities::Processor::Project.any_instance.expects(:destroy).returns(project)
+        end
+
+        it 'is expected to not try to destroy the attributes' do
+          project.destroy
+        end
+      end
+    end
+  end
+
+  describe 'class methods' do
+    describe 'public_or_owned_by_user' do
+      let!(:user) { FactoryGirl.build(:user, :with_id) }
+
+      let!(:owned_private_attrs)     { FactoryGirl.build(:project_attributes, :private, user_id: user.id) }
+      let!(:owned_public_attrs)      { FactoryGirl.build(:project_attributes,           user_id: user.id) }
+      let!(:not_owned_private_attrs) { FactoryGirl.build(:project_attributes, :private, user_id: user.id + 1) }
+      let!(:not_owned_public_attrs)  { FactoryGirl.build(:project_attributes,           user_id: user.id + 1) }
+
+      let!(:public_attrs) { [owned_public_attrs, not_owned_public_attrs] }
+      let(:public_projects) { public_attrs.map(&:project) }
+
+      let!(:owned_or_public_attrs) { public_attrs + [owned_private_attrs] }
+      let!(:owned_or_public_projects) { owned_or_public_attrs.map(&:project) }
+
+      let(:all_projects) { owned_or_public_projects + [not_owned_private_attrs.project] }
+
+      context 'when projects exist' do
+        before :each do
+          all_projects.each do |project|
+            described_class.stubs(:find).with(project.id).returns(project)
+          end
+
+          ProjectAttributes.expects(:where).with(public: true).returns(public_attrs)
+        end
+
+        context 'when user is not provided' do
+          it 'is expected to find all public reading groups' do
+            expect(described_class.public_or_owned_by_user).to eq(public_projects)
+          end
+        end
+
+        context 'when user is provided' do
+          before do
+            ProjectAttributes.expects(:where).with(user_id: user.id, public: false).returns([owned_private_attrs])
+          end
+
+          it 'is expected to find all public and owned reading groups' do
+            expect(described_class.public_or_owned_by_user(user)).to eq(owned_or_public_projects)
+          end
+        end
+      end
+
+      context 'when no reading groups exist' do
+        before :each do
+          all_projects.each do |project|
+            described_class.stubs(:find).with(project.id).raises(KalibroClient::Errors::RecordNotFound)
+          end
+
+          ProjectAttributes.expects(:where).with(public: true).returns(public_attrs)
+        end
+
+        it 'is expected to be empty' do
+          expect(described_class.public_or_owned_by_user).to be_empty
+        end
+      end
     end
   end
 end
...	...	@@ -13,7 +13,7 @@ class ProjectsController < ApplicationController
13	13	# GET /projects
14	14	# GET /projects.json
15	15	def index
16		- @projects = Project.all.select { \|project\| !project.attributes.hidden }
	16	+ @projects = Project.public_or_owned_by_user(current_user)
17	17	end
18	18
19	19	# POST /projects
...	...
...	...	@@ -3,18 +3,30 @@ class Project < KalibroClient::Entities::Processor::Project
3	3
4	4	attr_writer :attributes
5	5
	6	+ def self.public_or_owned_by_user(user = nil)
	7	+ project_attributes = ProjectAttributes.where(public: true)
	8	+ project_attributes += ProjectAttributes.where(user_id: user.id, public: false) if user
	9	+
	10	+ project_attributes.map do \|attribute\|
	11	+ begin
	12	+ self.find(attribute.project_id)
	13	+ rescue KalibroClient::Errors::RecordNotFound
	14	+ nil
	15	+ end
	16	+ end.compact
	17	+ end
	18	+
6	19	def self.latest(count = 1)
7		- all.sort { \|a,b\| b.id <=> a.id }.select { \|project\| !project.attributes.hidden}.first(count)
	20	+ all.sort { \|a, b\| b.id <=> a.id }.select { \|project\| project.attributes.public }.first(count)
8	21	end
9	22
10	23	def attributes
11		- @project_attributes \|\|= ProjectAttributes.find_by_project_id(self.id)
12		- @project_attributes.nil? ? ProjectAttributes.new : @project_attributes
	24	+ @attributes \|\|= ProjectAttributes.find_by_project_id(@id)
13	25	end
14	26
15	27	def destroy
16		- self.attributes.destroy if self.attributes
17		- @project_attributes = nil
	28	+ self.attributes.destroy unless self.attributes.nil?
	29	+ @attributes = nil
18	30	super
19	31	end
20	32	end
...	...
...	...	@@ -4,6 +4,11 @@ class ProjectAttributes < ActiveRecord::Base
4	4	validates :user, presence: true
5	5
6	6	def project
7		- Project.find(self.project_id)
	7	+ @project \|\|= Project.find(project_id)
	8	+ end
	9	+
	10	+ def project=(project)
	11	+ @project = project
	12	+ self.project_id = project.id
8	13	end
9	14	end
...	...
...	...	@@ -10,7 +10,8 @@
10	10	<strong><%= KalibroModule.human_attribute_name('grade') %>:</strong>
11	11	<%= format_grade(@root_module_result.grade) %>
12	12	</p>
13		-<% unless @root_module_result.parent_id.nil? %>
	13	+
	14	+<% unless @root_module_result.parent_id == 0 %>
14	15	<p id="parent"><i class="icon-arrow-up"></i><%= link_to '../', '#parent', onClick: "Module.Tree.load('#{escape_javascript(image_tag 'loader.gif')} #{escape_javascript(t('loading_data'))}', #{@root_module_result.parent_id});" %></p>
15	16	<% end %>
16	17
...	...
1	1	set :application, 'mezuro'
2	2	set :repo_url, 'https://github.com/mezuro/mezuro.git'
3	3
4		-# ask :branch, proc { `git rev-parse --abbrev-ref HEAD`.chomp }
	4	+set :branch, 'stable'
5	5
6	6	set :deploy_to, "/home/mezuro/app"
7	7	# set :scm, :git
...	...
...	...	@@ -0,0 +1,15 @@
	1	+class ChangeProjectAttributesPublicDefault < ActiveRecord::Migration
	2	+ def up
	3	+ rename_column :project_attributes, :hidden, :public
	4	+ change_column_default :project_attributes, :public, true
	5	+
	6	+ ProjectAttributes.all.update_all('public = NOT public')
	7	+ end
	8	+
	9	+ def down
	10	+ rename_column :project_attributes, :public, :hidden
	11	+ change_column_default :project_attributes, :hidden, false
	12	+
	13	+ ProjectAttributes.all.update_all('hidden = NOT hidden')
	14	+ end
	15	+end
...	...
...	...	@@ -11,7 +11,10 @@
11	11	#
12	12	# It's strongly recommended that you check this file into your version control system.
13	13
14		-ActiveRecord::Schema.define(version: 20150616164352) do
	14	+ActiveRecord::Schema.define(version: 20151106182639) do
	15	+
	16	+ # These are extensions that must be enabled in order to support this database
	17	+ enable_extension "plpgsql"
15	18
16	19	create_table "kalibro_configuration_attributes", force: :cascade do \|t\|
17	20	t.integer "user_id"
...	...	@@ -25,9 +28,9 @@ ActiveRecord::Schema.define(version: 20150616164352) do
25	28	t.integer "project_id"
26	29	t.string "image_url"
27	30	t.integer "user_id"
28		- t.boolean "hidden", default: false
29		- t.datetime "created_at", null: false
30		- t.datetime "updated_at", null: false
	31	+ t.boolean "public", default: true
	32	+ t.datetime "created_at", null: false
	33	+ t.datetime "updated_at", null: false
31	34	end
32	35
33	36	create_table "reading_group_attributes", force: :cascade do \|t\|
...	...	@@ -45,7 +48,7 @@ ActiveRecord::Schema.define(version: 20150616164352) do
45	48	t.datetime "updated_at", null: false
46	49	end
47	50
48		- add_index "repository_attributes", ["user_id"], name: "index_repository_attributes_on_user_id"
	51	+ add_index "repository_attributes", ["user_id"], name: "index_repository_attributes_on_user_id", using: :btree
49	52
50	53	create_table "users", force: :cascade do \|t\|
51	54	t.string "name", limit: 255, default: "", null: false
...	...	@@ -63,7 +66,7 @@ ActiveRecord::Schema.define(version: 20150616164352) do
63	66	t.string "last_sign_in_ip", limit: 255
64	67	end
65	68
66		- add_index "users", ["email"], name: "index_users_on_email", unique: true
67		- add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
	69	+ add_index "users", ["email"], name: "index_users_on_email", unique: true, using: :btree
	70	+ add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true, using: :btree
68	71
69	72	end
...	...
...	...	@@ -22,7 +22,6 @@ Feature: Project Deletion
22	22	Given I am a regular user
23	23	And I am signed in
24	24	And I own a sample project
25		- And I have sample project_attributes
26	25	And I am at the Sample Project page
27	26	When I click the Destroy Project link
28	27	Then I should be in the All Projects page
...	...
...	...	@@ -8,13 +8,12 @@ Feature: Project
8	8	Given I am a regular user
9	9	And I am signed in
10	10	And I own a sample project
11		- And I have sample project_attributes
12	11	And I am at the All Projects page
13	12	When I click the Edit link
14	13	Then I should be in the Edit Project page
15	14
16	15	@kalibro_processor_restart
17		- Scenario: Should not show edit links from projects that doesn't belongs to me
	16	+ Scenario: Should not show edit links from projects that doesn't belong to me
18	17	Given I am a regular user
19	18	And I am signed in
20	19	And I have a sample project
...	...	@@ -22,7 +21,7 @@ Feature: Project
22	21	Then I should not see Edit within table
23	22
24	23	@kalibro_processor_restart
25		- Scenario: Should not render the edit page if the project doesn't belongs to the current user
	24	+ Scenario: Should not render the edit page if the project doesn't belong to the current user
26	25	Given I am a regular user
27	26	And I am signed in
28	27	And I have a sample project
...	...	@@ -35,7 +34,6 @@ Feature: Project
35	34	Given I am a regular user
36	35	And I am signed in
37	36	And I own a sample project
38		- And I have sample project_attributes
39	37	And I am at the All Projects page
40	38	When I click the Edit link
41	39	Then The field "project[name]" should be filled with the sample project "name"
...	...	@@ -46,7 +44,6 @@ Feature: Project
46	44	Given I am a regular user
47	45	And I am signed in
48	46	And I own a sample project
49		- And I have sample project_attributes
50	47	And I am at the sample project edit page
51	48	And I fill the Name field with "Kalibro"
52	49	And I fill the Description field with "Web Service to collect metrics"
...	...	@@ -61,7 +58,6 @@ Feature: Project
61	58	And I have a project named "Qt-Calculator"
62	59	And I own a project named "Kalibro"
63	60	And I am at the sample project edit page
64		- And I have sample project_attributes
65	61	And I fill the Name field with "Qt-Calculator"
66	62	When I press the Save button
67	63	Then I should see "Name has already been taken"
...	...	@@ -71,7 +67,6 @@ Feature: Project
71	67	Given I am a regular user
72	68	And I am signed in
73	69	And I own a sample project
74		- And I have sample project_attributes
75	70	And I am at the sample project edit page
76	71	And I fill the Description field with "Web Service to collect metrics"
77	72	When I press the Save button
...	...	@@ -82,7 +77,6 @@ Feature: Project
82	77	Given I am a regular user
83	78	And I am signed in
84	79	And I own a sample project
85		- And I have sample project_attributes
86	80	And I am at the sample project edit page
87	81	And I fill the Name field with " "
88	82	When I press the Save button
...	...
...	...	@@ -25,7 +25,6 @@ Feature: Project listing
25	25	Given I am a regular user
26	26	And I am signed in
27	27	And I have a sample project
28		- And I have sample project_attributes
29	28	And I am at the All Projects page
30	29	When I click the Show link
31	30	Then the sample project should be there
...	...