superbara 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9398c3450c5aac178102ba61fd6908bfa1cc9b1e514090af69450850c9d3baa0
-  data.tar.gz: e5b9fde8a63e5fac2ae2400ae52cfcb88da49500af4bf53827794111a8438dc5
+  metadata.gz: ffe6293f27192cca303e3024bd37faeeae3467f264f1052cca556823fd5a275d
+  data.tar.gz: 7df3dde796cb590b7b3a65057a9603bf6d5a61d364dec00d1e1f246252e6054c
 SHA512:
-  metadata.gz: dfbce06e7c6564c011375a3d48b7be585cb659edd3b6928bcdc8e463694b51b6728c301ea95462ac2e30f4bf6701228ffd0ef7c6beedfbb28ecbe49ec4cc4343
-  data.tar.gz: 9b75c0daa7d629f422aa91a53272993822bdef0d2e47f9f62700687c2fd77debee06139147d484ded93268dbac7ab6fad9b8fc9ba7b2bd913c268352ecf84346
+  metadata.gz: 16f2b79e5c269cccec533ea3df29ef9e0b0468efb6ce52732829e5e36ee69ae9810c0157fb84564d09e33d1ce70771f0a1cd4860144c50ef49fc2c759658686e
+  data.tar.gz: 31fb3c8a6210cdec887145ea4ce64f88825e8d0d8d106c49fd4816c13f3c0a01d3b25c18aa4ee02b5ff51b7863e07335e7e8534c9503e8a9cfea66ee16b0e9d1

data/Dockerfile

@@ -3,4 +3,6 @@ ARG version
 COPY superbara-${version}.gem /tmp
 RUN gem install /tmp/superbara-${version}.gem && rm /tmp/superbara-${version}.gem
 
-ENTRYPOINT ["/usr/local/bundle/bin/superbara", "run", "/e2e"]
+WORKDIR /tests
+CMD ["all"]
+ENTRYPOINT ["/usr/local/bundle/bin/superbara", "run"]

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    superbara (0.5.1)
+    superbara (0.6.0)
       binding_of_caller (~> 0.8, >= 0.8.0)
       capybara (~> 3.1, >= 3.1.0)
       chromedriver-helper (~> 1.2.0, >= 1.2.0)
@@ -44,6 +44,7 @@ GEM
     i18n (1.0.1)
       concurrent-ruby (~> 1.0)
     io-like (0.3.0)
+    kommando (0.1.2)
     method_source (0.9.0)
     mini_mime (1.0.0)
     mini_portile2 (2.3.0)
@@ -94,6 +95,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.15, >= 1.15.0)
+  kommando (~> 0.1, >= 0.1.2)
   rake (~> 10.0, >= 10.0.0)
   rspec (~> 3.7, >= 3.7.0)
   superbara!

data/README.md

@@ -22,7 +22,7 @@ name_field.type "Sarah", :enter
 if has_text? "Welcome, Sarah"
   run "logout"
 else
-  fail "no greeting visible"
+  assert "no greeting visible"
 end
 ```
 

data/Rakefile

@@ -3,4 +3,16 @@ require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task :default => [:spec, :superbara]
+
+task :superbara do
+  require 'kommando'
+
+  k = Kommando.new "bin/tests", {
+    output: true
+  }
+
+  k.run
+
+  raise "not clean" unless k.code == 0
+end

data/bin/release

@@ -3,7 +3,6 @@ set -e
 version=$(exe/superbara version)
 
 rake
-SUPERBARA_FRONTEND=noninteractive exe/superbara run e2e
 
 gem build superbara.gemspec
 KUNG_ENV=build VERSION=$version kung build

data/bin/tests

@@ -0,0 +1,27 @@
+#!/usr/bin/env sh
+set -e
+tests="all minimal"
+
+for test in $tests; do
+  set +e
+    exe/superbara run tests/$test
+    exit_status=$?
+  set -e
+
+  if [ "$exit_status" != 0 ]; then
+    echo "err!"
+    exit 1
+  fi
+done
+
+set +e
+  exe/superbara run tests/fail
+  exit_status=$?
+set -e
+
+if [ "$exit_status" != 1 ]; then
+  echo "err!"
+  exit 1
+fi
+
+echo "success!"

data/docker-compose.test.yml

@@ -7,7 +7,7 @@ services:
       - SUPERBARA_FRONTEND=noninteractive
       - CHROME_URL=http://chrome:4444/wd/hub
     volumes:
-      - ./e2e:/e2e
+      - ./tests:/tests
     depends_on:
       - chrome
   chrome:

data/lib/pry_monkey.rb

@@ -71,8 +71,8 @@ Pry.commands.alias_command 'n', 'next'
 Pry.commands.alias_command 'h', 'help'
 
 Pry::Commands.command /^e$/, "edit" do
-  puts "Opening #{Superbara.project_path} ..."
-  `superbara edit #{Superbara.project_path}`
+  output = `superbara edit #{Superbara.project_path}`
+  puts output
 end
 
 Pry::Commands.command /^help$/, "help" do

data/lib/superbara/cli.rb

@@ -5,6 +5,26 @@ module Superbara; module CLI
     case main_command
     when "version"
       puts Superbara::VERSION
+      exit 0
+    when "edit"
+      editor_cmd = if ENV["SUPERBARA_EDITOR"]
+        ENV["SUPERBARA_EDITOR"]
+      elsif ENV["EDITOR"]
+        ENV["EDITOR"]
+      else
+        'open'
+      end
+
+      dir_or_file = ARGV[1]
+
+      puts "Opening #{dir_or_file} with #{editor_cmd} .."
+
+      if editor_cmd == "nano"
+        exec "#{editor_cmd} #{dir_or_file}"
+      else
+        `#{editor_cmd} #{dir_or_file}`
+      end
+
       exit 0
     when "web", "shell"
       #
@@ -20,18 +40,24 @@ module Superbara; module CLI
         exit 1
       end
 
-      contents = """visit \"http://example.com\"
+      contents = """visit 'example.com'
 
 wait 3 do
-  has_text? \"Example Domain\"
+  has_text? 'Example Domain'
 end
-click \"h1\"
+
 think 1..3
-click \"a\"
+
+click 'a'
 scroll 50
 """
       Dir.mkdir project_name
       File.write File.join(project_name, "main.rb"), contents
+
+      puts "Created directory #{project_name} with main.rb"
+      puts "Start testing with:"
+      puts ""
+      puts "  superbara start #{project_name}"
       exit 0
     else
       unless ARGV[1]
@@ -48,13 +74,26 @@ scroll 50
 """
         exit 1
       end
+    end
 
-      project_path_expanded = File.expand_path(ARGV[1])
+    case main_command
+    when "start", "run"
+      project_path_or_file_expanded = File.expand_path(ARGV[1])
 
-      Superbara.project_path = if Dir.exists? project_path_expanded
-        project_path_expanded
+      Superbara.project_path, project_entrypoint = if Dir.exists? project_path_or_file_expanded
+        unless File.exist? File.join(project_path_or_file_expanded, "main.rb")
+          puts "No main.rb found in #{project_path_or_file_expanded}"
+          puts "Alternatively you can also specify the file name."
+          exit 1
+        end
+        [project_path_or_file_expanded, "main.rb"]
+      elsif File.exists? project_path_or_file_expanded
+        [
+          File.dirname(project_path_or_file_expanded),
+          File.basename(project_path_or_file_expanded)
+        ]
       else
-        puts "#{project_path_expanded} is not a directory"
+        puts "#{project_path_or_file_expanded} is not a directory or a file"
         exit 1
       end
     end
@@ -68,7 +107,7 @@ scroll 50
       begin
         case main_command
         when "web"
-          webapp = Superbara::Web.new
+          webapp = Superbara::Web.new port: (ENV['SUPERBARA_WEB_PORT'] || 4567)
           webapp.run!
           exit 0
         when "shell"
@@ -90,11 +129,16 @@ scroll 50
           puts ""
           puts "t      action".colorize(:light_black)
           Superbara.start!
-          Superbara.visual_disable!
-          Superbara.current_context.__superbara_eval "visit 'about:blank'"
-          Superbara.visual_enable!
+          Superbara.visual_disabled do
+            Superbara.current_context.__superbara_eval "visit 'about:blank'"
+          end
 
-          Superbara.current_context.__superbara_load(File.join(Superbara.project_path, "main.rb"))
+          case main_command
+          when "start"
+            Superbara.visual_enable!
+          end
+
+          Superbara.current_context.__superbara_load(File.join(Superbara.project_path, project_entrypoint))
 
           puts """
   🏁 🏁 🏁 done."""
@@ -126,7 +170,12 @@ scroll 50
 in #{offending_file_path}:#{offending_line}
 #{offending_line}: #{offending_code}""".colorize(:light_black)
 
-        Superbara.current_context.__superbara_debug
+        case main_command
+        when "start"
+          Superbara.current_context.__superbara_debug
+        else
+          exit 1
+        end
       end
     end
   end

data/lib/superbara/dsl.rb

@@ -3,7 +3,15 @@ module Superbara; module DSL
     #"Superbara::DSL included in #{includer.inspect}"
   end
 
-  def fail(message=nil)
+  def assert(message=nil, &block)
+    failed = if block
+      !block.call
+    else
+      true
+    end
+
+    return unless failed
+
     if message
       Superbara.output ("FAIL: ".colorize(:red) + message)
     else
@@ -73,11 +81,25 @@ return Array.from(
         @@once_runs << what
       end
     end
-
     Superbara.output "run #{what}"
     Superbara.toast "run #{what}" if Superbara.visual?
 
-    Superbara.current_context.__superbara_load(File.join(Superbara.project_path, "#{what}.rb"))
+    what_expanded = File.expand_path(File.join(Superbara.project_path, what))
+    better_what = if Dir.exist? what_expanded
+      File.join what_expanded, "main.rb"
+    elsif what_expanded.end_with? ".rb"
+      what_expanded
+    else
+      "#{what_expanded}.rb"
+    end
+
+    old_project_path = Superbara.project_path
+    unless Superbara.project_path == File.dirname(better_what)
+      Superbara.project_path = File.dirname(better_what)
+    end
+
+    Superbara.current_context.__superbara_load(better_what)
+    Superbara.project_path = old_project_path
   end
 
   def visit(visit_uri_or_domain_or_path)
@@ -255,7 +277,7 @@ return Array.from(
     q - exit to shell"""
 
     debug_header_prefix = "== DEBUG "
-    debug_header_suffix = "=" * (IO.console.winsize.last - debug_header_prefix.size)
+    debug_header_suffix = "=" * (IO.console.winsize.last - debug_header_prefix.size).abs
 
     if help
       puts """

data/lib/superbara/version.rb

@@ -1,3 +1,3 @@
 module Superbara
-  VERSION = "0.5.1"
+  VERSION = "0.6.0"
 end

data/lib/superbara/web.rb

@@ -1,7 +1,7 @@
 require 'sinatra/base'
 
 module Superbara; class Web
-  def initialize(access_log: true, server_bind: '127.0.0.1')
+  def initialize(access_log: true, server_bind: '127.0.0.1', port: 4567)
     @webapp = Sinatra.new do
       root_path = File.join(File.dirname(__FILE__), "..", "..", "web")
 
@@ -11,6 +11,7 @@ module Superbara; class Web
 
       set :bind, server_bind
       set :root, root_path
+      set :port, port
 
       get '/' do
         File.read(File.join(root_path,"public", "index.html"))

data/lib/superbara.rb

@@ -46,6 +46,25 @@ module Superbara
     return true if ENV["SUPERBARA_VISUAL"]
   end
 
+  def self.visual_disabled(&block)
+    env_was_set = if ENV["SUPERBARA_VISUAL"]
+      ENV.delete "SUPERBARA_VISUAL"
+      true
+    end
+
+    visual_was_set = if Superbara.visual?
+      self.visual_disable!
+      true
+    end
+
+    value = block.call
+
+    ENV["SUPERBARA_VISUAL"] = "true" if env_was_set
+    Superbara.visual_enable! if visual_was_set
+
+    value
+  end
+
   def self.visual_enable!
     @@visual = true
   end

data/superbara.gemspec

@@ -32,4 +32,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.15', '>= 1.15.0'
   spec.add_development_dependency 'rake', '~> 10.0', '>= 10.0.0'
   spec.add_development_dependency 'rspec', '~> 3.7', '>= 3.7.0'
+  spec.add_development_dependency 'kommando', '~> 0.1', '>= 0.1.2'
 end

data/tests/all/main.rb

@@ -0,0 +1,15 @@
+run "../common", once: true
+
+wait "3" do
+  has_text? "Superbara"
+end
+
+for feature_path in Dir.glob("tests/features/*.rb") do
+  feature_file = "../features/#{File.basename(feature_path)}"
+
+  puts """
+
+RUNNING: #{feature_file}
+"""
+  run "../features/#{File.basename(feature_path)}"
+end

data/tests/common/main.rb

@@ -0,0 +1,4 @@
+run "vars"
+run "webapp", once: true
+
+visit "#{$test_host}:4567"

data/tests/fail/main.rb

@@ -0,0 +1 @@
+asdf

data/tests/features/examplecom.rb

@@ -0,0 +1,9 @@
+run "../common"
+
+visit "example.com"
+
+wait 5 do
+  has_text? "Example Domain"
+end
+
+run "../common"

data/tests/features/find.rb

@@ -0,0 +1,17 @@
+run "../common"
+
+h1 = find "h1"
+assert h1.text do
+  h1.text == "Superbara"
+end
+
+h1_text = find "h1", text: "Superbara"
+assert h1_text.text do
+  h1_text.text == "Superbara"
+end
+
+another = find "a", text: "Another"
+assert another.text do
+  another.text == "Another page"
+end
+

data/tests/features/navigate.rb

@@ -0,0 +1,37 @@
+run "../common"
+
+click_link "Another page"
+
+assert current_url do
+  current_url.end_with? "/another.html"
+end
+
+back
+
+assert current_url do
+  current_url.end_with? "/"
+end
+
+forward
+
+assert current_url do
+  current_url.end_with? "/another.html"
+end
+
+back
+
+visit "/__superbara/wait"
+
+wait 0.8 do
+  has_text? "500ms"
+end
+
+reload
+
+assert text do
+  ! text.match? "500ms"
+end
+
+wait 0.8 do
+  has_text? "500ms"
+end

data/{e2e → tests/features}/prompt.rb

@@ -1,7 +1,11 @@
+run "../common"
+
 visit "/__superbara/prompt"
 
 message = accept_prompt with: 'Linda Liukas' do
   click_link 'Author Quiz!'
 end
 
-fail unless message == 'Who is the author of Hello Ruby?'
+assert message do
+  message == 'Who is the author of Hello Ruby?'
+end

data/{e2e → tests/features}/type.rb

@@ -1,4 +1,4 @@
-visit "/"
+run "../common"
 
 textarea = find "textarea"
 textarea.type "hello", :backspace, :backspace, "sinki", :enter

data/{e2e → tests/features}/wait.rb

@@ -1,6 +1,10 @@
+run "../common"
+
 visit "/__superbara/wait"
 
-fail if has_text? "500ms"
+assert do
+  has_no_text? "500ms"
+end
 
 wait 0.8 do
   has_text? "500ms"

data/tests/minimal/main.rb

@@ -0,0 +1,3 @@
+run "../common", once: true do
+  puts "common already loaded"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: superbara
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Matti Paksula
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-17 00:00:00.000000000 Z
+date: 2018-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -230,6 +230,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.7.0
+- !ruby/object:Gem::Dependency
+  name: kommando
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.2
 description: Better way to build Capybara tests
 email:
 - matti.paksula@iki.fi
@@ -252,16 +272,10 @@ files:
 - bin/autotest
 - bin/console
 - bin/release
+- bin/tests
 - docker-compose.build.yml
 - docker-compose.test.yml
 - docker-compose.yml
-- e2e/example.rb
-- e2e/init.rb
-- e2e/main.rb
-- e2e/prompt.rb
-- e2e/type.rb
-- e2e/vars.rb
-- e2e/wait.rb
 - exe/superbara
 - lib/capybara_monkey.rb
 - lib/pry_monkey.rb
@@ -276,6 +290,18 @@ files:
 - lib/superbara/version.rb
 - lib/superbara/web.rb
 - superbara.gemspec
+- tests/all/main.rb
+- tests/common/main.rb
+- tests/common/vars.rb
+- tests/common/webapp.rb
+- tests/fail/main.rb
+- tests/features/examplecom.rb
+- tests/features/find.rb
+- tests/features/navigate.rb
+- tests/features/prompt.rb
+- tests/features/type.rb
+- tests/features/wait.rb
+- tests/minimal/main.rb
 - web/public/1.html
 - web/public/2.html
 - web/public/3.html

data/e2e/example.rb

@@ -1,7 +0,0 @@
-wait 5 do
-  visit "example.com"
-end
-
-wait 5 do
-  has_text? "Example Domain"
-end

data/e2e/main.rb

@@ -1,17 +0,0 @@
-run "init", once: true
-run "vars"
-
-visit "#{$test_host}:4567"
-wait "3" do
-  has_text? "Superbara"
-end
-
-run "wait"
-run "prompt"
-run "type"
-
-run "example", once: true do
-  visit "example.com"
-end
-
-find "h1"