github-migration
/
engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:locomotivecms/engine

This commit is contained in:
did 2011-10-18 18:46:03 +02:00
parent 8298b2a4bf fcac15c6b1
commit ca44edd58f
4 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -60,7 +60,7 @@ group :test, :development do
gem 'bushido_stub', '0.0.3' gem 'bushido_stub', '0.0.3'
gem 'cucumber-rails', '1.0.2' gem 'cucumber-rails'
end end
group :test do group :test do

24
Gemfile.lock
View File

@ -70,16 +70,16 @@ GEM
columnize (0.3.4) columnize (0.3.4)
configuration (1.3.1) configuration (1.3.1)
crack (0.1.8) crack (0.1.8)
cucumber (1.0.6) cucumber (1.1.0)
builder (>= 2.1.2) builder (>= 2.1.2)
diff-lcs (>= 1.1.2) diff-lcs (>= 1.1.2)
gherkin (~> 2.4.18) gherkin (~> 2.5.0)
json (>= 1.4.6) json (>= 1.4.6)
term-ansicolor (>= 1.0.6) term-ansicolor (>= 1.0.6)
cucumber-rails (1.0.2) cucumber-rails (1.1.1)
capybara (>= 1.0.0) capybara (>= 1.1.1)
cucumber (~> 1.0.0) cucumber (>= 1.1.0)
nokogiri (>= 1.4.6) nokogiri (>= 1.5.0)
custom_fields (1.0.0.beta.25) custom_fields (1.0.0.beta.25)
activesupport (~> 3.0.9) activesupport (~> 3.0.9)
mongoid (= 2.0.2) mongoid (= 2.0.2)
@ -125,7 +125,7 @@ GEM
actionpack (>= 2.3.7) actionpack (>= 2.3.7)
activesupport (>= 2.3.7) activesupport (>= 2.3.7)
i18n (~> 0.4) i18n (~> 0.4)
gherkin (2.4.21) gherkin (2.5.2)
json (>= 1.4.6) json (>= 1.4.6)
growl-glue (1.0.7) growl-glue (1.0.7)
haml (3.1.2) haml (3.1.2)
@ -133,7 +133,7 @@ GEM
heroku (1.19.1) heroku (1.19.1)
activesupport (>= 2.1.0) activesupport (>= 2.1.0)
launchy (~> 0.3.2) launchy (~> 0.3.2)
rest-client (< 1.7.0, >= 1.4.0) rest-client (>= 1.4.0, < 1.7.0)
highline (1.6.2) highline (1.6.2)
httparty (0.7.8) httparty (0.7.8)
crack (= 0.1.8) crack (= 0.1.8)
@ -250,15 +250,15 @@ GEM
s3 (0.3.8) s3 (0.3.8)
proxies (~> 0.2.0) proxies (~> 0.2.0)
sanitize (2.0.3) sanitize (2.0.3)
nokogiri (< 1.6, >= 1.4.4) nokogiri (>= 1.4.4, < 1.6)
sass (3.1.2) sass (3.1.2)
selenium-webdriver (2.7.0) selenium-webdriver (2.8.0)
childprocess (>= 0.2.1) childprocess (>= 0.2.1)
ffi (>= 1.0.7) ffi (>= 1.0.7)
json_pure json_pure
rubyzip rubyzip
spork (0.9.0.rc9) spork (0.9.0.rc9)
term-ansicolor (1.0.6) term-ansicolor (1.0.7)
thor (0.14.6) thor (0.14.6)
treetop (1.4.10) treetop (1.4.10)
polyglot polyglot
@ -292,7 +292,7 @@ DEPENDENCIES
capybara capybara
carrierwave (= 0.5.6) carrierwave (= 0.5.6)
cells cells
cucumber-rails (= 1.0.2) cucumber-rails
custom_fields (= 1.0.0.beta.25) custom_fields (= 1.0.0.beta.25)
database_cleaner database_cleaner
delayed_job (= 2.1.4) delayed_job (= 2.1.4)

16
features/admin/authorization/pages.feature
View File

@ -3,14 +3,14 @@ Feature: Pages
As an admin, designer or author As an admin, designer or author
I will be restricted based on my role I will be restricted based on my role
Background: Background:
Given I have the site: "test site" set up Given I have the site: "test site" set up
And I have a custom model named "Projects" with And I have a custom model named "Projects" with
| label | kind | required | | label | kind | required |
| Name | string | true | | Name | string | true |
| Description | text | false | | Description | text | false |
And I have a designer and an author And I have a designer and an author
And a page named "hello-world" with the template: And a page named "hello-world" with the template:
""" """
Hello World Hello World
""" """

2
features/step_definitions/content_types_steps.rb
View File

@ -64,6 +64,6 @@ Then %r{^I should not see (\d+) times the "([^"]*)" field$} do |n, field|
end end
Then %r{^I should see once the "([^"]*)" field$} do |field| Then %r{^I should see once the "([^"]*)" field$} do |field|
page.all(:css, "#content_#{field.underscore.downcase}_input").size.should == 1 page.should have_css("#content_#{field.underscore.downcase}_input", :count => 1)
end end