Skip to content

Commit 6ab08c3

Browse files
committed
Change default folder to doc/api
Closes #81
1 parent 7ae7489 commit 6ab08c3

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

features/combined_json.feature

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ Feature: Combined text
6363
And the exit status should be 0
6464

6565
Scenario: File should look like we expect
66-
Then the file "docs/combined.json" should contain JSON exactly like:
66+
Then the file "doc/api/combined.json" should contain JSON exactly like:
6767
"""
6868
[
6969
{

features/combined_text.feature

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ Feature: Combined text
6868
And the exit status should be 0
6969

7070
Scenario: File should look like we expect
71-
Then the file "docs/greetings/index.txt" should contain exactly:
71+
Then the file "doc/api/greetings/index.txt" should contain exactly:
7272
"""
7373
Greeting your favorite gem
7474
--------------------------

features/json_iodocs.feature

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ Feature: Json Iodocs
6464
And the exit status should be 0
6565

6666
Scenario: File should look like we expect
67-
Then the file "docs/app.json" should contain JSON exactly like:
67+
Then the file "doc/api/app.json" should contain JSON exactly like:
6868
"""
6969
{
7070
"endpoints": [

features/support/capybara.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Wire up Capybara to test again static files served by Rack
55
# Courtesy of http://opensoul.org/blog/archives/2010/05/11/capybaras-eating-cucumbers/
66

7-
root_dir = File.join(File.dirname(__FILE__), '..', '..', 'tmp', 'aruba', 'docs')
7+
root_dir = File.join(File.dirname(__FILE__), '..', '..', 'tmp', 'aruba', 'doc', 'api')
88

99
Capybara.app = Rack::Builder.new do
1010
map "/" do

lib/rspec_api_documentation/configuration.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ def self.add_setting(name, opts = {})
3636

3737
add_setting :docs_dir, :default => lambda { |config|
3838
if defined?(Rails)
39-
Rails.root.join("docs")
39+
Rails.root.join("doc", "api")
4040
else
41-
Pathname.new("docs")
41+
Pathname.new("doc/api")
4242
end
4343
}
4444

spec/configuration_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@
3838
before { Rails = double(:application => rails_app, :root => rails_root) }
3939
after { Object.send(:remove_const, :Rails) }
4040

41-
its(:docs_dir) { should == rails_root.join("docs") }
41+
its(:docs_dir) { should == rails_root.join("doc", "api") }
4242
its(:app) { should == rails_app }
4343
end
4444

45-
its(:docs_dir) { should == Pathname.new("docs") }
45+
its(:docs_dir) { should == Pathname.new("doc/api") }
4646
its(:format) { should == :html }
4747
its(:template_path) { should == default_template_path }
4848
its(:filter) { should == :all }

0 commit comments

Comments
 (0)