+
+ <% end %>
-
diff --git a/features/manage_articles.feature b/features/manage_articles.feature
new file mode 100644
index 0000000000..4334c118ba
--- /dev/null
+++ b/features/manage_articles.feature
@@ -0,0 +1,13 @@
+Feature: Manage Articles
+ In order to organize articles
+ As an admin
+ I want to add a new category
+
+ Background:
+ Given the blog is set up
+ And I am logged into the admin panel
+
+ Scenario: Create category page is shown
+ Given I am on the admin page
+ When I follow "Categories"
+ Then I should be on the new or edit category page
diff --git a/features/manage_categories.feature b/features/manage_categories.feature
new file mode 100644
index 0000000000..a5a45aa0c4
--- /dev/null
+++ b/features/manage_categories.feature
@@ -0,0 +1,23 @@
+Feature: Manage Categories
+ In order to better organize articles
+ As an admin
+ I want to add or edit a category
+
+ Background:
+ Given the blog is set up
+ And I am logged into the admin panel
+
+ Scenario: Category page is shown
+ Given I am on the admin page
+ When I follow "Categories"
+ Then I should be on the category page
+
+ Scenario: Create and edit category
+ Given I am on the category page
+ When I fill in "category_name" with "mishmash"
+ And I press "Save"
+ Then I should see "Category was successfully saved."
+ And I should see "mishmash"
+ And I should have 1 new category
+ When I follow "mishmash"
+ Then I should see "mishmash"
diff --git a/features/merge_articles.feature b/features/merge_articles.feature
new file mode 100644
index 0000000000..7c3ed28b49
--- /dev/null
+++ b/features/merge_articles.feature
@@ -0,0 +1,26 @@
+Feature: Merge articles
+ As a blog administrator
+ In order to improve UX
+ I want to be able to merge articles with other similar articles
+
+ Background:
+ Given the blog is set up
+
+ Scenario: Merge articles form is not shown on new article view
+ Given I am on the admin page
+ And I am logged into the admin panel
+ When I follow "New Article"
+ Then I should not see "Merge Articles"
+
+ Scenario: Merge articles field is not shown for non admins
+ Given I am on the admin content page
+ And I am logged into the admin panel as a non admin
+ When I follow "Edit"
+ Then I should be on the admin content page
+ And I should see "Error, you are not allowed to perform this action"
+
+ Scenario: Merge articles field is shown for admins
+ Given I am on the admin content page
+ And I am logged into the admin panel
+ When I follow "Edit"
+ Then I should see "Merge Articles"
diff --git a/features/step_definitions/web_steps.rb b/features/step_definitions/web_steps.rb
index 6315105872..eaa8b4e69a 100644
--- a/features/step_definitions/web_steps.rb
+++ b/features/step_definitions/web_steps.rb
@@ -41,6 +41,12 @@ def with_scope(locator)
:profile_id => 1,
:name => 'admin',
:state => 'active'})
+ User.create!({:login => 'not admin',
+ :password => 'bbbbb',
+ :email => 'nojoe@snow.com',
+ :profile_id => 2,
+ :name => 'not admin',
+ :state => 'active'})
end
And /^I am logged into the admin panel$/ do
@@ -55,6 +61,26 @@ def with_scope(locator)
end
end
+And /^I am logged into the admin panel as a non admin$/ do
+ visit '/accounts/login'
+ fill_in 'user_login', :with => 'not admin'
+ fill_in 'user_password', :with => 'bbbbb'
+ click_button 'Login'
+ if page.respond_to? :should
+ page.should have_content('Login successful')
+ else
+ assert page.has_content?('Login successful')
+ end
+end
+
+# And /^I am not an admin$/ do
+# User.name != 'admin'
+# end
+#
+# And /^I am an admin$/ do
+# User.name == 'admin'
+# end
+
# Single-line step scoper
When /^(.*) within (.*[^:])$/ do |step, parent|
with_scope(parent) { When step }
@@ -162,6 +188,12 @@ def with_scope(locator)
end
end
+Then /^I should have (\d+) new category$/ do |count|
+ # expect{Category.count}.to change{Category.count}.by(arg1)
+ Category.count.should == count.to_i + 1
+end
+
+
Then /^the "([^"]*)" field(?: within (.*))? should contain "([^"]*)"$/ do |field, parent, value|
with_scope(parent) do
field = find_field(field)
@@ -250,7 +282,7 @@ def with_scope(locator)
end
end
end
-
+
Then /^(?:|I )should be on (.+)$/ do |page_name|
current_path = URI.parse(current_url).path
if current_path.respond_to? :should
@@ -264,8 +296,8 @@ def with_scope(locator)
query = URI.parse(current_url).query
actual_params = query ? CGI.parse(query) : {}
expected_params = {}
- expected_pairs.rows_hash.each_pair{|k,v| expected_params[k] = v.split(',')}
-
+ expected_pairs.rows_hash.each_pair{|k,v| expected_params[k] = v.split(',')}
+
if actual_params.respond_to? :should
actual_params.should == expected_params
else
diff --git a/features/support/paths.rb b/features/support/paths.rb
index e7e00e5d89..71580b6b45 100644
--- a/features/support/paths.rb
+++ b/features/support/paths.rb
@@ -17,6 +17,17 @@ def path_to(page_name)
'/'
when /^the new article page$/
'/admin/content/new'
+ when /^the admin page$/
+ '/admin'
+ when /^the category page$/
+ '/admin/categories/new'
+ when /^the admin content page$/
+ '/admin/content'
+ when /^the admin edit content page$/
+ '/admin/content/edit'
+ when /^the category edit page$/
+ '/admin/catogories/edit'
+
# Add more mappings here.
# Here is an example that pulls values out of the Regexp:
diff --git a/spec/controllers/admin/categories_controller_spec.rb b/spec/controllers/admin/categories_controller_spec.rb
index bb290f4a0d..e0f6061419 100644
--- a/spec/controllers/admin/categories_controller_spec.rb
+++ b/spec/controllers/admin/categories_controller_spec.rb
@@ -16,6 +16,18 @@
assert_response :redirect, :action => 'index'
end
+ describe "test_new" do
+ it "should render template new" do
+ get :new
+ assert_template 'new'
+ end
+
+ it "should redirect to new template" do
+ get :new
+ assert_response :success
+ end
+ end
+
describe "test_edit" do
before(:each) do
get :edit, :id => Factory(:category).id
@@ -48,7 +60,7 @@
it 'should render destroy template' do
assert_response :success
- assert_template 'destroy'
+ assert_template 'destroy'
end
end
@@ -62,5 +74,5 @@
assert_raise(ActiveRecord::RecordNotFound) { Category.find(test_id) }
end
-
+
end