wagn 1.20.0 → 1.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd1e828fb6c8ee33f6cc48e17c3b5a102eb90483
-  data.tar.gz: 376b28cbee4e38ca2abe10591c0150e44145f156
+  metadata.gz: 6dffc37a2889618b5d050be8245b96f04c2e3158
+  data.tar.gz: 07cfa60ae76b35fd2f2198643bab61a10f6e5289
 SHA512:
-  metadata.gz: df71a97b7d1ba6320557ca14a5e7d0d94bec48c62e8e064fb9c62b4507c10eea52308bbc5965fac9b11d7ca9f8d3afcb736ae642b41d15cf7c20378907ae8e31
-  data.tar.gz: 61c053e4f2f1854ad40d9303bce379910e0afef3744aabeffa1551314ab2aad23a601b995fc583f99f4c613b812cacdfcb9c54d53f38a41d6ce014d3219739eb
+  metadata.gz: 7256a1ebc8ae176adf2cde46a6c05b5997f919730f295e9cf628a1541d8355a44e762441bb31ac444428226eb66ed5de957596a6c6b99223658ca6e08c4080cd
+  data.tar.gz: 8d522e43cf859b267263c9d7c2c88b24f7012760786ed6b41e55d972ee00e8e6679a34b7a0ebed495a615680cd9b68d3fdb7a5f8a71e2c9b40187a29a2b5d072

data/features/attach.feature

@@ -4,7 +4,7 @@ Feature: File Upload
 
   Background:
     Given I am signed in as Joe Admin
-    And I wait until ajax response done
+    And I wait for ajax response
 
   Scenario: Block creating a new empty file
     When I go to new File
@@ -16,12 +16,12 @@ Feature: File Upload
   Scenario: Uploading a file
     When I go to new File
     And I upload the file "file.txt"
-    And I wait until ajax response done
+    And I wait for ajax response
     Then I should see "file.txt 9 Bytes"
     When I press "Delete"
     Then I should see "Add file..."
     When I upload the file "file.txt"
-    And I wait until ajax response done
+    And I wait for ajax response
     And I fill in "card_name" with "a test file"
     And I press "Submit"
     Then I should see "Download a test file"
@@ -29,26 +29,26 @@ Feature: File Upload
   Scenario: Uploading and changing an image
     When I go to new Image
     And I upload the image "image.png"
-    And I wait until ajax response done
+    And I wait for ajax response
     Then I should see "image.png 34.3 KB"
     And I fill in "card_name" with "a test image"
     And I press "Submit"
     Then I should see an image of size "large" and type "png"
     And I edit "a test image"
     And I upload the image "image2.jpg"
-    And I wait until ajax response done
+    And I wait for ajax response
     Then I should see "image2.jpg 69.8 KB"
     And I press "Submit"
     Then I should see an image of size "large" and type "jpg"
-    And I wait until ajax response done
+    And I wait for ajax response
 
   Scenario: Changing a coded image
     When I edit "*logo"
     And I upload the image "image2.jpg"
-    And I wait until ajax response done
+    And I wait for ajax response
     Then I should see "image2.jpg 69.8 KB"
     And I press "Submit"
-    And I wait until ajax response done
+    And I wait for ajax response
     Then I should see a non-coded image of size "large" and type "jpg"
 
   Scenario: uploading a file as a field in a form
@@ -58,13 +58,13 @@ Feature: File Upload
     And I create HTML card "complicated card+*type+*structure" with content "{{+image}}{{+description}}"
     And I go to "/new complicated_card"
     And I fill in "card_name" with "Vignesh has a complicated relationship"
-    And I wait until ajax response done
+    And I wait for ajax response
     And I upload the image "image.png"
-    And I wait until ajax response done
+    And I wait for ajax response
     Then I should see "image.png 34.3 KB"
     And I press "Submit"
     Then I should see an image of size "medium" and type "png"
-    And I wait until ajax response done
+    And I wait for ajax response
 
   Scenario: updating a file as a field in a form
     When I go to  "/new Cardtype"
@@ -73,17 +73,17 @@ Feature: File Upload
     And I create HTML card "complicated card+*type+*structure" with content "{{+image}}{{+description}}"
     And I go to "/new complicated_card"
     And I fill in "card_name" with "Vignesh has a complicated relationship"
-    And I wait until ajax response done
+    And I wait for ajax response
     And I upload the image "image.png"
-    And I wait until ajax response done
+    And I wait for ajax response
     And I press "Submit"
     And I edit "Vignesh has a complicated relationship"
     And I upload the image "image2.jpg"
-    And I wait until ajax response done
+    And I wait for ajax response
     Then I should see "image2.jpg 69.8 KB"
     And I press "Submit"
     Then I should see an image of size "medium" and type "jpg"
-    And I wait until ajax response done
+    And I wait for ajax response
 
   Scenario: submit a form without updating a file
     When I go to  "/new Cardtype"
@@ -92,14 +92,14 @@ Feature: File Upload
     And I create HTML card "complicated card+*type+*structure" with content "{{+image}}{{+description}}"
     And I go to "/new complicated_card"
     And I fill in "card_name" with "Vignesh has a complicated relationship"
-    And I wait until ajax response done
+    And I wait for ajax response
     And I upload the image "image.png"
-    And I wait until ajax response done
+    And I wait for ajax response
     And I press "Submit"
     And I edit "Vignesh has a complicated relationship"
     And I press "Submit"
-    And I wait until ajax response done
+    And I wait for ajax response
     Then within ".card-body" I should see an image of size "medium" and type "png"
-    And I wait until ajax response done
+    And I wait for ajax response
 
 

data/features/history.feature

@@ -1,25 +1,27 @@
-@javascript
-Feature: History
-  As an editor
-  I want to be able to browse through the history and save an old version as
-  current.
-
-  Background:
-    Given I am signed in as Joe Admin
-    Then the card First should not contain "chicken"
-
-  Scenario: view history and rollback
-    When I go to url "/First?view=history"
-#    Then In the main card content I should see a del with content "egg"
-
-    When I expand act 2
-#    And In the main card content I click "Hide changes"
-#    Then In the main card content I should not see a del with content "egg"
-    When In the main card body I click "Save as current"
-    And I wait until ajax response
-
-    Then In the main card content I should see "chicken"
-
-    #Then the card First should contain "chicken"
+# @javascript
+# Feature: History
+#   As an editor
+#   I want to be able to browse through the history and save an old version as
+#   current.
+#
+#   Background:
+#     Given I am signed in as Joe Admin
+#     Then the card First should not contain "chicken"
+#
+#   Scenario: view history and rollback
+#     When I go to url "/First?view=history"
+#     #    Then In the main card content I should see a del with content "egg"
+#
+#     When I expand act 2
+#     #    And In the main card content I click "Hide changes"
+#     #    Then In the main card content I should not see a del with content "egg"
+#     And I wait for ajax response
+#
+#     When In the main card body I click "Save as current"
+#     And I wait for ajax response
+#
+#     Then In the main card content I should see "chicken"
+#
+#     #Then the card First should contain "chicken"
 
 

data/features/paging.feature

@@ -13,20 +13,20 @@ Feature: paging
     And I create HTML card "list all basic cards" with content "{{basic card search||content;structure:basic item structure}}"
     And I go to card "list all basic cards"
     And I click "2" within ".paging"
-    And I wait until ajax response done
+    And I wait for ajax response
     Then I should see css class ".STRUCTURE-basic_item_structure" within ".search-result-item"
     And I click "3" within ".paging"
-    And I wait until ajax response done
+    And I wait for ajax response
     Then I should see css class ".STRUCTURE-basic_item_structure" within ".search-result-item"
 
   Scenario: jump to pages should keep the item view
     When I create HTML card "list basic types" with content "{{basic card search|open|closed}}"
     And I go to card "list basic types"
     And I click "2" within ".paging"
-    And I wait until ajax response done
+    And I wait for ajax response
     Then I should see css class ".closed-view" within ".search-result-item"
     And I click "3" within ".paging"
-    And I wait until ajax response done
+    And I wait for ajax response
     Then I should see css class ".TYPE-search.open-view"
     Then I should see css class ".closed-view" within ".search-result-item"
 

data/features/reference.feature

@@ -2,10 +2,10 @@
 Feature: Reference
   In order to connect related cards
   As a Wagneer
-  
+
   Background:
     Given I am signed in as Joe Admin
-    And I wait until ajax response done
+    And I wait for ajax response
 
   Scenario: Renaming a embed card
     When I create PlainText card "Vignesh" with content "Indian"
@@ -14,7 +14,7 @@ Feature: Reference
     And I fill in "card_name" with "Srivigneshwar"
     And I press "Rename"
     And I press "Rename and Update"
-    And I wait until ajax response done
+    And I wait for ajax response
     Then I go to card "Kawaii Man"
     And I should see "Srivigneshwar"
 

data/features/step_definitions/wagn_steps.rb

@@ -177,7 +177,7 @@ When /I wait (\d+) seconds$/ do |period|
   sleep period.to_i
 end
 
-When /^I wait until ajax response done$/ do
+When /^I wait for ajax response$/ do
   Timeout.timeout(Capybara.default_wait_time) do
     sleep(0.5) while page.evaluate_script("jQuery.active") != 0
   end
@@ -187,10 +187,11 @@ end
 #   save_and_open_page
 # end
 #
-# Then /debug/ do
+Then /debug/ do
+  require 'pry'
+  binding.pry
+end
 #   if RUBY_VERSION =~ /^2/
-#     require 'pry'
-#     binding.pry
 #   else
 #     debugger
 #   end

data/features/step_definitions/web_steps.rb

@@ -51,9 +51,30 @@ When /^(?:|I )select "([^"]*)" from "([^"]*)"$/ do |value, field|
   select(value, from: field)
 end
 
+When /^(?:|I )submit form$/ do
+  find(:css, "button[type='submit']").click
+end
+
 When /^(?:|I )single-select "([^"]*)" from "([^"]*)"$/ do |value, field|
-  find("label", text: field).parent.find("a.chosen-single").click
-  find("li", text: value).click
+  select =
+    find("label", text: field).find(:xpath, "..//select", visible: false)
+  value = select.find("option", text: value, visible: false)["value"]
+  page.execute_script("$('##{select['id']}').val('#{value}')")
+  page.execute_script("$('##{select['id']}').trigger('chosen:updated')")
+  page.execute_script("$('##{select['id']}').change()")
+
+  # code below doesn't work on wikirate because if you select an item in
+  # a very long list the list gets pushed below the navigation bar
+  # find("label", text: field).find(:xpath, "..//a[@class='chosen-single']")
+  #                           .click
+  # li = find("li", text: value, visible: false)
+  # li.click
+  # # If the list element is too far down the list then the first click
+  # # scrolls it up but doesn't select it. It needs another click.
+  # # A selected item is no longer visible (because the list disappears)
+  # if li.visible?
+  #   li.click
+  # end
 end
 
 # Use this step in conjunction with Rail's datetime_select helper. For example:

data/features/support/env.rb

@@ -36,7 +36,8 @@ require "test_after_commit"
 # prefer to use XPath just remove this line and adjust any selectors in your
 # steps to use the XPath syntax.
 Capybara.default_selector = :css
-Capybara.default_wait_time = 30
+Capybara.default_wait_time = 5
+Cardio.config.paging_limit = 10
 # By default, any exception happening in your Rails application will bubble up
 # to Cucumber so that your scenario will fail. This is a different from how
 # your application behaves in the production environment, where an error page

data/features/toolbar.feature

@@ -17,11 +17,11 @@ Scenario: close toolbar
 
 Scenario: pin and unpin toolbar
   When In main card toolbar I find button with icon "pushpin" and click it
-  And I wait until ajax response done
+  And I wait for ajax response
   And I go to card "Home"
   Then In main card frame I should see a nav with class "toolbar"
   And In main card toolbar I should see a button with class "toolbar-pin.active"
   When In main card toolbar I find button with icon "pushpin" and click it
-  And I wait until ajax response done
+  And I wait for ajax response
   And I go to card "Home"
   Then In main card frame I should not see a nav with class "toolbar"

data/lib/wagn/generators/wagn/templates/Gemfile

@@ -75,7 +75,7 @@ end
 group :test do
   gem 'fog'
   gem 'fog-aws'
-  gem 'rspec-html-matchers'
+  gem 'rspec-html-matchers', '0.8.1' # 0.9 requires ruby >= 2.1
   gem 'rr' #, '=1.0.0'
 	gem 'simplecov', '~> 0.7.1', :require => false  #test coverage
   gem 'codeclimate-test-reporter', require: nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wagn
 version: !ruby/object:Gem::Version
-  version: 1.20.0
+  version: 1.20.1
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-02 00:00:00.000000000 Z
+date: 2017-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -33,14 +33,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.20.0
+        version: 1.20.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.20.0
+        version: 1.20.1
 description: a wiki approach to stuctured data, dynamic interaction,  and web design
 email:
 - info@wagn.org